avoid naked exit

2 files changed, 7 insertions, 7 deletions

diff --git a/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp b/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp
index fbaa5581173..04a811494c9 100644
--- a/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp
+++ b/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/vespalib/util/shutdownguard.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <cstdlib>
 
 using namespace vespalib;
 
@@ -23,7 +24,7 @@ Test::Main()
         for (int i = 0; i < 1000; ++i) {
             std::this_thread::sleep_for(20ms);
         }
-        exit(0);
+        std::_Exit(0);
     }
     for (int i = 0; i < 1000; ++i) {
         std::this_thread::sleep_for(20ms);
diff --git a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp
index 3041627b2d0..0141e32e435 100644
--- a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp
+++ b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp
@@ -310,13 +310,13 @@ int main(int argc, char *argv[])
                } else {
                    std::vector<pthread_t> threads(numThreads);
                    for (size_t j(0); j < numThreads; j++) {
-                        pthread_create(&threads[j], NULL, (VFUNC)runBenchMark, &indirectSlotVector);
+                       pthread_create(&threads[j], NULL, (VFUNC)runBenchMark, &indirectSlotVector);
                    }
                    for (size_t j(0); j < numThreads; j++) {
                        pthread_join(threads[j], NULL);
                    }
                }
-           break;
+            break;
         default:
             printf("'m' = %s\n", description[type]);
             printf("'M' = %s\n", description[type]);
@@ -327,11 +327,10 @@ int main(int argc, char *argv[])
             printf("'g' = %s\n", description[type]);
             printf("'G' = %s\n", description[type]);
             printf("'J' = %s\n", description[type]);
-            printf("Unspecified type %c. Running map benchmark\n", type);
-            exit(1);
-            break;
+            printf("Unspecified type %c.\n", type);
+            return 1;
         }
     }
     printf("Running test '%c' = %s, result = %ld unique values\n", type, description[type], uniq);
+    return 0;
 }
-