Add the line number to the verbose output from abts. This also removes

a test that is segfaulting in testshm.  That will need to be fixed.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@65095 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 29 insertions, 29 deletions

diff --git a/test/testproc.c b/test/testproc.c
index a7a6f9f38..259286f12 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -34,38 +34,38 @@ static void test_create_proc(abts_case *tc, void *data)
     char *buf;
 
     rv = apr_procattr_create(&attr, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_procattr_io_set(attr, APR_FULL_BLOCK, APR_FULL_BLOCK, 
                              APR_NO_PIPE);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_procattr_dir_set(attr, "data");
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     args[0] = "proc_child" EXTENSION;
     args[1] = NULL;
     
     rv = apr_proc_create(&newproc, "../proc_child" EXTENSION, args, NULL, 
                          attr, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     testfile = newproc.in;
 
     length = strlen(TESTSTR);
     rv = apr_file_write(testfile, TESTSTR, &length);
-    abts_int_equal(tc, APR_SUCCESS, rv);
-    abts_int_equal(tc, strlen(TESTSTR), length);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, strlen(TESTSTR), length);
 
     testfile = newproc.out;
     length = 256;
     buf = apr_pcalloc(p, length);
     rv = apr_file_read(testfile, buf, &length);
-    abts_int_equal(tc, APR_SUCCESS, rv);
-    abts_str_equal(tc, TESTSTR, buf);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_STR_EQUAL(tc, TESTSTR, buf);
 }
 
 static void test_proc_wait(abts_case *tc, void *data)
@@ -73,7 +73,7 @@ static void test_proc_wait(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_proc_wait(&newproc, NULL, NULL, APR_WAIT);
-    abts_int_equal(tc, APR_CHILD_DONE, rv);
+    ABTS_INT_EQUAL(tc, APR_CHILD_DONE, rv);
 }
 
 static void test_file_redir(abts_case *tc, void *data)
@@ -92,55 +92,55 @@ static void test_file_redir(abts_case *tc, void *data)
     rv = apr_file_open(&testfile, "data/stdin",
                        APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
                        APR_OS_DEFAULT, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_file_open(&testout, "data/stdout",
                        APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
                        APR_OS_DEFAULT, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_file_open(&testerr, "data/stderr",
                        APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
                        APR_OS_DEFAULT, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     length = strlen(TESTSTR);
     apr_file_write(testfile, TESTSTR, &length);
     offset = 0;
     rv = apr_file_seek(testfile, APR_SET, &offset);
-    abts_int_equal(tc, APR_SUCCESS, rv);
-    abts_int_equal(tc, 0, offset);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, 0, offset);
 
     rv = apr_procattr_create(&attr, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_procattr_child_in_set(attr, testfile, NULL);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_procattr_child_out_set(attr, testout, NULL);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_procattr_child_err_set(attr, testerr, NULL);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_procattr_dir_set(attr, "data");
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     args[0] = "proc_child";
     args[1] = NULL;
 
     rv = apr_proc_create(&newproc, "../proc_child" EXTENSION, args, NULL, 
                          attr, p);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_proc_wait(&newproc, NULL, NULL, APR_WAIT);
-    abts_int_equal(tc, APR_CHILD_DONE, rv);
+    ABTS_INT_EQUAL(tc, APR_CHILD_DONE, rv);
 
     offset = 0;
     rv = apr_file_seek(testout, APR_SET, &offset);
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     length = 256;
     buf = apr_pcalloc(p, length);
     rv = apr_file_read(testout, buf, &length);
-    abts_int_equal(tc, APR_SUCCESS, rv);
-    abts_str_equal(tc, TESTSTR, buf);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_STR_EQUAL(tc, TESTSTR, buf);
 
 
     apr_file_close(testfile);
@@ -148,11 +148,11 @@ static void test_file_redir(abts_case *tc, void *data)
     apr_file_close(testerr);
 
     rv = apr_file_remove("data/stdin", p);;
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_file_remove("data/stdout", p);;
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     rv = apr_file_remove("data/stderr", p);;
-    abts_int_equal(tc, APR_SUCCESS, rv);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 abts_suite *testproc(abts_suite *suite)