Changeset 745 for trunk/server/lib/tdb/tools/tdbtest.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/tools/tdbtest.c (modified) (3 diffs)

trunk/server/lib/tdb/tools/tdbtest.c

@@ -216 +216 @@
 }
 
+static char *test_path(const char *filename)
+{
+        const char *prefix = getenv("TEST_DATA_PREFIX");
+
+        if (prefix) {
+                char *path = NULL;
+                int ret;
+
+                ret = asprintf(&path, "%s/%s", prefix, filename);
+                if (ret == -1) {
+                        return NULL;
+                }
+                return path;
+        }
+
+        return strdup(filename);
+}
+
  int main(int argc, const char *argv[])
 {
@@ -221 +239 @@
         int loops = 10000;
         int num_entries;
-        char test_gdbm[] = "test.gdbm";
-
-        unlink("test.gdbm");
-
-        db = tdb_open("test.tdb", 0, TDB_CLEAR_IF_FIRST, 
+        char test_gdbm[1] = "test.gdbm";
+        char *test_tdb;
+
+        test_gdbm[0] = test_path("test.gdbm");
+        test_tdb = test_path("test.tdb");
+
+        unlink(test_gdbm[0]);
+
+        db = tdb_open(test_tdb, 0, TDB_CLEAR_IF_FIRST,
                       O_RDWR | O_CREAT | O_TRUNC, 0600);
         gdbm = gdbm_open(test_gdbm, 512, GDBM_WRITER|GDBM_NEWDB|GDBM_FAST, 
@@ -262 +284 @@
         gdbm_close(gdbm);
 
+        free(test_gdbm[0]);
+        free(test_tdb);
+
         return 0;
 }