ctdb-tests: Rename ctdb_lock_tdb to lock_tdb

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/tests/src/ctdb_lock_tdb.c b/ctdb/tests/src/ctdb_lock_tdb.c
deleted file mode 100644 (file)
index df313c6..0000000
--- a/ctdb/tests/src/ctdb_lock_tdb.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "replace.h"
-#include "system/filesys.h"
-
-#include <tdb.h>
-
-const char *tdb_file;
-TDB_CONTEXT *tdb;
-
-static void signal_handler(int signum)
-{
-       tdb_close(tdb);
-}
-
-
-int
-main(int argc, char *argv[])
-{
-       if (argc != 2) {
-               printf("Usage: %s <tdb file>\n", argv[0]);
-               exit(1);
-       }
-
-       tdb_file = argv[1];
-
-       tdb = tdb_open(tdb_file, 0, 0, O_RDWR, 0);
-       if (tdb == NULL) {
-               fprintf(stderr, "Failed to open TDB file %s\n", tdb_file);
-               exit(1);
-       }
-
-       signal(SIGINT, signal_handler);
-
-       if (tdb_lockall(tdb) != 0) {
-               fprintf(stderr, "Failed to lock database %s\n", tdb_file);
-               tdb_close(tdb);
-               exit(1);
-       }
-
-       sleep(999999);
-
-       return 0;
-}

diff --git a/ctdb/tests/src/lock_tdb.c b/ctdb/tests/src/lock_tdb.c
new file mode 100644 (file)
index 0000000..c37f846
--- /dev/null
+++ b/ctdb/tests/src/lock_tdb.c
@@ -0,0 +1,60 @@
+/*
+   Lock a tdb and sleep
+
+   Copyright (C) Amitay Isaacs  2012
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "replace.h"
+#include "system/filesys.h"
+
+#include <tdb.h>
+
+const char *tdb_file;
+TDB_CONTEXT *tdb;
+
+static void signal_handler(int signum)
+{
+       tdb_close(tdb);
+}
+
+int
+main(int argc, char *argv[])
+{
+       if (argc != 2) {
+               printf("Usage: %s <tdb file>\n", argv[0]);
+               exit(1);
+       }
+
+       tdb_file = argv[1];
+
+       tdb = tdb_open(tdb_file, 0, 0, O_RDWR, 0);
+       if (tdb == NULL) {
+               fprintf(stderr, "Failed to open TDB file %s\n", tdb_file);
+               exit(1);
+       }
+
+       signal(SIGINT, signal_handler);
+
+       if (tdb_lockall(tdb) != 0) {
+               fprintf(stderr, "Failed to lock database %s\n", tdb_file);
+               tdb_close(tdb);
+               exit(1);
+       }
+
+       sleep(999999);
+
+       return 0;
+}

diff --git a/ctdb/wscript b/ctdb/wscript
index d577d8e3dd87148f811630df05595c2a2633f243..fc17f7916b63acdc03856e9a626d7ad8eb224758 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -687,7 +687,6 @@ def build(bld):
         'ctdb_randrec',
         'ctdb_persistent',
         'ctdb_porting_tests',
-        'ctdb_lock_tdb'
     ]
 
     for target in ctdb_tests:
@@ -714,7 +713,8 @@ def build(bld):
         'fetch_readonly_loop',
         'transaction_loop',
         'update_record',
-        'update_record_persistent'
+        'update_record_persistent',
+        'lock_tdb'
     ]
 
     for target in ctdb_tests: