X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb_errorstr.c;h=742fb89113411b627b3fe96bb1d31eb8225427c9;hp=ad2df9142cbd5e0616d47aa79cb14e992f212a3f;hb=3d99c9334fe3067c88772547b9c06acec21616ea;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782

diff --git a/ccan/tdb2/test/run-tdb_errorstr.c b/ccan/tdb2/test/run-tdb_errorstr.c
index ad2df914..742fb891 100644
--- a/ccan/tdb2/test/run-tdb_errorstr.c
+++ b/ccan/tdb2/test/run-tdb_errorstr.c
@@ -1,68 +1,52 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 
 int main(int argc, char *argv[])
 {
-	struct tdb_context *tdb;
+	enum TDB_ERROR err;
+	plan_tests(TDB_ERR_RDONLY*-1 + 2);
 
-	plan_tests(1 + TDB_ERR_NESTING + 2);
-	tdb = tdb_open("run-tdb_errorstr.tdb", TDB_DEFAULT,
-		       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
-	ok1(tdb);
-	if (tdb) {
-		enum TDB_ERROR err;
-		for (err = TDB_SUCCESS; err <= TDB_ERR_NESTING; err++) {
-			tdb->ecode = err;
-			switch (err) {
-			case TDB_SUCCESS:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Success"));
-				break;
-			case TDB_ERR_NESTING:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Transaction already started"));
-				break;
-			case TDB_ERR_IO:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "IO Error"));
-				break;
-			case TDB_ERR_LOCK:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Locking error"));
-				break;
-			case TDB_ERR_OOM:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Out of memory"));
-				break;
-			case TDB_ERR_EXISTS:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Record exists"));
-				break;
-			case TDB_ERR_EINVAL:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Invalid parameter"));
-				break;
-			case TDB_ERR_NOEXIST:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Record does not exist"));
-				break;
-			case TDB_ERR_RDONLY:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "write not permitted"));
-				break;
-			case TDB_ERR_CORRUPT:
-				ok1(!strcmp(tdb_errorstr(tdb),
-					    "Corrupt database"));
-			}
+	for (err = TDB_SUCCESS; err >= TDB_ERR_RDONLY; err--) {
+		switch (err) {
+		case TDB_SUCCESS:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Success"));
+			break;
+		case TDB_ERR_IO:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "IO Error"));
+			break;
+		case TDB_ERR_LOCK:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Locking error"));
+			break;
+		case TDB_ERR_OOM:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Out of memory"));
+			break;
+		case TDB_ERR_EXISTS:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Record exists"));
+			break;
+		case TDB_ERR_EINVAL:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Invalid parameter"));
+			break;
+		case TDB_ERR_NOEXIST:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Record does not exist"));
+			break;
+		case TDB_ERR_RDONLY:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "write not permitted"));
+			break;
+		case TDB_ERR_CORRUPT:
+			ok1(!strcmp(tdb_errorstr(err),
+				    "Corrupt database"));
+			break;
 		}
-		tdb->ecode = err;
-		ok1(!strcmp(tdb_errorstr(tdb), "Invalid error code"));
 	}
+	ok1(!strcmp(tdb_errorstr(err), "Invalid error code"));
+
 	return exit_status();
 }