Tests: use consistent output spacing and flush before running each test.

diff --git a/src/tests/cptests/cptests.cc b/src/tests/cptests/cptests.cc
index 33f2bde485684560a3ba4349d5b23888a999728a..ab3fdb58ebc0b0909a27967cefea9d0d6e73b32f 100644 (file)
--- a/src/tests/cptests/cptests.cc
+++ b/src/tests/cptests/cptests.cc
@@ -646,20 +646,20 @@ void cptest_addrmdeps()
 
 
 #define RUN_TEST(name, spacing) \
-    std::cout << #name "..." spacing; \
+    std::cout << #name "..." spacing << std::flush; \
     name(); \
     std::cout << "PASSED" << std::endl;
 
 int main(int argc, char **argv)
 {
-    RUN_TEST(cptest_queryver, "    ");
-    RUN_TEST(cptest_listservices, "");
-    RUN_TEST(cptest_findservice1, "");
-    RUN_TEST(cptest_findservice2, "");
-    RUN_TEST(cptest_findservice3, "");
-    RUN_TEST(cptest_loadservice, " ");
-    RUN_TEST(cptest_startstop, "   ");
-    RUN_TEST(cptest_unload, "      ");
-    RUN_TEST(cptest_addrmdeps, "   ");
+    RUN_TEST(cptest_queryver, "           ");
+    RUN_TEST(cptest_listservices, "       ");
+    RUN_TEST(cptest_findservice1, "       ");
+    RUN_TEST(cptest_findservice2, "       ");
+    RUN_TEST(cptest_findservice3, "       ");
+    RUN_TEST(cptest_loadservice, "        ");
+    RUN_TEST(cptest_startstop, "          ");
+    RUN_TEST(cptest_unload, "             ");
+    RUN_TEST(cptest_addrmdeps, "          ");
     return 0;
 }

diff --git a/src/tests/loadtests.cc b/src/tests/loadtests.cc
index cbca7e028d2ece1fcefbdb3f24d1a483152bb937..4c786df55b22b51e6ec0161b599f0d44623e0a21 100644 (file)
--- a/src/tests/loadtests.cc
+++ b/src/tests/loadtests.cc
@@ -49,15 +49,15 @@ void test_nonexistent()
 }
 
 #define RUN_TEST(name, spacing) \
-    std::cout << #name "..." spacing; \
+    std::cout << #name "..." spacing << std::flush; \
     name(); \
     std::cout << "PASSED" << std::endl;
 
 int main(int argc, char **argv)
 {
     init_test_service_dir();
-    RUN_TEST(test_basic, "      ");
-    RUN_TEST(test_env_subst, "  ");
-    RUN_TEST(test_nonexistent, "");
+    RUN_TEST(test_basic, "                ");
+    RUN_TEST(test_env_subst, "            ");
+    RUN_TEST(test_nonexistent, "          ");
     return 0;
 }

diff --git a/src/tests/proctests.cc b/src/tests/proctests.cc
index 01995832472a7befefe514aeda052600be2e9922..27c0c643550408730859098250e7fe13f9e09fbf 100644 (file)
--- a/src/tests/proctests.cc
+++ b/src/tests/proctests.cc
@@ -788,7 +788,7 @@ void test_waitsfor_restart()
 
 
 #define RUN_TEST(name, spacing) \
-    std::cout << #name "..." spacing; \
+    std::cout << #name "..." spacing << std::flush; \
     name(); \
     std::cout << "PASSED" << std::endl;
 

diff --git a/src/tests/tests.cc b/src/tests/tests.cc
index cfdaf807784b4c26adb95990ef620dd1e0c99d5b..dd1510d5d66c3930bfcc6e2dc2e4b86bc9c9b0f5 100644 (file)
--- a/src/tests/tests.cc
+++ b/src/tests/tests.cc
@@ -552,26 +552,27 @@ void test12()
     assert(sset.count_active_services() == 0);
 }
 
-#define RUN_TEST(name) \
-    std::cout << #name "... "; \
+
+#define RUN_TEST(name, spacing) \
+    std::cout << #name "..." spacing << std::flush; \
     name(); \
     std::cout << "PASSED" << std::endl;
 
 int main(int argc, char **argv)
 {
-    RUN_TEST(test1);
-    RUN_TEST(test2);
-    RUN_TEST(test3);
-    RUN_TEST(test4);
-    RUN_TEST(test5);
-    RUN_TEST(test_pin1);
-    RUN_TEST(test_pin2);
-    RUN_TEST(test_pin3);
-    RUN_TEST(test_pin4);
-    RUN_TEST(test7);
-    RUN_TEST(test8);
-    RUN_TEST(test9);
-    RUN_TEST(test10);
-    RUN_TEST(test11);
-    RUN_TEST(test12);
+    RUN_TEST(test1, "                     ");
+    RUN_TEST(test2, "                     ");
+    RUN_TEST(test3, "                     ");
+    RUN_TEST(test4, "                     ");
+    RUN_TEST(test5, "                     ");
+    RUN_TEST(test_pin1, "                 ");
+    RUN_TEST(test_pin2, "                 ");
+    RUN_TEST(test_pin3, "                 ");
+    RUN_TEST(test_pin4, "                 ");
+    RUN_TEST(test7, "                     ");
+    RUN_TEST(test8, "                     ");
+    RUN_TEST(test9, "                     ");
+    RUN_TEST(test10, "                    ");
+    RUN_TEST(test11, "                    ");
+    RUN_TEST(test12, "                    ");
 }