r19373: Merge changes from subunit branch: Convert libreplace testsuite to a

standalone program that speaks subunit.
(This used to be commit 48d316e7594dfc29b8e6a710e32bb5a6a036b7cf)

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index b5a3a031eb938b29c0329ae73546aab8839f61c3..4abb2c8430ba5c6ee41768af4c92ebdca63f4f87 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -4,6 +4,7 @@ include socket/config.mk
 include charset/config.mk
 include ldb/config.mk
 include talloc/config.mk
+include replace/config.mk
 include tdb/config.mk
 include tls/config.mk
 include registry/config.mk

diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
new file mode 100644 (file)
index 0000000..ff80955
--- /dev/null
+++ b/source4/lib/replace/config.mk
@@ -0,0 +1,4 @@
+[BINARY::REPLACE]
+OBJ_FILES = test/testsuite.o test/os2_delete.o
+PRIVATE_DEPENDENCIES = LIBREPLACE
+INSTALLDIR = TORTUREDIR/LOCAL

diff --git a/source4/lib/replace/test/os2_delete.c b/source4/lib/replace/test/os2_delete.c
index 8501e0bb409a2c9dccb28e5244c4a256e3456511..c8abfccff9bdbd111bdedc1ff49f6e22e93ea690 100644 (file)
--- a/source4/lib/replace/test/os2_delete.c
+++ b/source4/lib/replace/test/os2_delete.c
@@ -21,7 +21,7 @@
 
 static int test_readdir_os2_delete_ret;
 
-#define FAILED(d) (fprintf(stderr, "Failed for %s - %d = %s\n", d, errno, strerror(errno)), test_readdir_os2_delete_ret = 1, 1)
+#define FAILED(d) (printf("failure: readdir [\nFailed for %s - %d = %s\n]\n", d, errno, strerror(errno)), test_readdir_os2_delete_ret = 1, 1)
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -107,7 +107,7 @@ int test_readdir_os2_delete(void)
        }
        closedir(d);
 
-       printf("Deleted %d files of %d\n", total_deleted, NUM_FILES);
+       fprintf(stderr, "Deleted %d files of %d\n", total_deleted, NUM_FILES);
 
        rmdir(TESTDIR) == 0 || FAILED("rmdir");
 

diff --git a/source4/lib/replace/test/testsuite.c b/source4/lib/replace/test/testsuite.c
index d45304103f7da3a74c1e6bc2ce443314fe94072e..3e20e22e450daa919cb3db463abfcde5c4aab2fc 100644 (file)
--- a/source4/lib/replace/test/testsuite.c
+++ b/source4/lib/replace/test/testsuite.c
@@ -57,26 +57,28 @@ static int test_ftruncate(void)
        struct stat st;
        int fd;
        const int size = 1234;
-       printf("testing ftruncate\n");
+       printf("test: ftruncate\n");
        unlink(TESTFILE);
        fd = open(TESTFILE, O_RDWR|O_CREAT, 0600);
        if (fd == -1) {
-               printf("creating '%s' failed - %s\n", TESTFILE, strerror(errno));
+               printf("failure: ftruncate [\n"
+                          "creating '%s' failed - %s\n]\n", TESTFILE, strerror(errno));
                return false;
        }
        if (ftruncate(fd, size) != 0) {
-               printf("ftruncate failed - %s\n", strerror(errno));
+               printf("failure: ftruncate [\n%s\n]\n", strerror(errno));
                return false;
        }
        if (fstat(fd, &st) != 0) {
-               printf("fstat failed - %s\n", strerror(errno));
+               printf("failure: ftruncate [\nfstat failed - %s\n]\n", strerror(errno));
                return false;
        }
        if (st.st_size != size) {
-               printf("ftruncate gave wrong size %d - expected %d\n",
+               printf("failure: ftruncate [\ngave wrong size %d - expected %d\n]\n",
                       (int)st.st_size, size);
                return false;
        }
+       printf("success: ftruncate\n");
        return true;
 }
 
@@ -98,13 +100,14 @@ static int test_strlcpy(void)
                { NULL, 0 }
        };
        int i;
-       printf("testing strlcpy\n");
+       printf("test: strlcpy\n");
        for (i=0;tests[i].src;i++) {
                if (strlcpy(buf, tests[i].src, sizeof(buf)) != tests[i].result) {
-                       printf("strlcpy test %d failed\n", i);
+                       printf("failure: strlcpy [\ntest %d failed\n]\n", i);
                        return false;
                }
        }
+       printf("success: strlcpy\n");
        return true;
 }
 
@@ -146,8 +149,9 @@ static int test_strdup(void)
 
 static int test_setlinebuf(void)
 {
-       printf("testing setlinebuf\n");
+       printf("test: setlinebuf\n");
        setlinebuf(stdout);
+       printf("success: setlinebuf\n");
        return true;
 }
 
@@ -233,10 +237,11 @@ extern int test_readdir_os2_delete(void);
 
 static int test_readdir(void)
 {
-       printf("testing readdir\n");
+       printf("test: readdir\n");
        if (test_readdir_os2_delete() != 0) {
                return false;
        }
+       printf("success: readdir\n");
        return true;
 }
 
@@ -373,7 +378,7 @@ static int test_MAX(void)
 
 struct torture_context;
 
-bool torture_local_replace(struct torture_context *torture)
+int main()
 {
        bool ret = true;
        ret &= test_ftruncate();
@@ -420,16 +425,7 @@ bool torture_local_replace(struct torture_context *torture)
        ret &= test_MIN();
        ret &= test_MAX();
 
-       return ret;
+       if (ret) 
+               return 0;
+       return -1;
 }
-
-#if _SAMBA_BUILD_<4
-int main(void)
-{
-       if (!torture_local_replace(NULL)) {
-               printf("ERROR: TESTSUITE FAILED\n");
-               return -1;
-       }
-       return 0;
-}
-#endif

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index a997732c29a3b26f679b3086f46b13bb46b434a5..55659447ec4dbe21b0bc617a713a3dc6a75fed1f 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -7,8 +7,6 @@ PRIVATE_PROTO_HEADER = \
                proto.h
 OBJ_FILES = \
                iconv.o \
-               ../../lib/replace/test/testsuite.o \
-               ../../lib/replace/test/os2_delete.o \
                ../../lib/crypto/md4test.o \
                ../../lib/crypto/md5test.o \
                ../../lib/crypto/hmacmd5test.o \

diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 240897119967676e5f515767d7ad6c1010a984d6..3846c3b18cf53cf11453cc908022f5b7e61aa3d7 100644 (file)
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -53,7 +53,6 @@ NTSTATUS torture_local_init(void)
                                                                                talloc_autofree_context(),
                                                                                "LOCAL");
 
-       torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace);
        torture_suite_add_simple_test(suite, "CRYPTO-SHA1", 
                                                                  torture_local_crypto_sha1);
        torture_suite_add_simple_test(suite,