Merge branch 'return-code'

Author: dlidstrom

src/Duplo.cpp

@@ -356,7 +356,7 @@ namespace {
     }
 }
 
-void Duplo::Run(const Options& options) {
+int Duplo::Run(const Options& options) {
     std::streambuf* buf;
     std::streambuf* logbuf;
     std::ofstream of;
@@ -507,4 +507,8 @@ void Duplo::Run(const Options& options) {
             << std::endl
             << std::endl;
     }
+
+    return processResultTotal.Blocks() > 0
+        ? EXIT_FAILURE
+        : EXIT_SUCCESS;
 }

src/Main.cpp

@@ -42,8 +42,7 @@ namespace {
                 ignoreSameFilename,
                 listFilename,
                 outputFilename);
-            Duplo::Run(options);
-            return EXIT_SUCCESS;
+            return Duplo::Run(options);
         } else {
             std::cout << "\nNAME\n";
             std::cout << "       Duplo " << VERSION << " - duplicate source code block finder\n\n";

src/include/Duplo.h

@@ -14,7 +14,7 @@ const std::string VERSION = "";
 #endif
 
 namespace Duplo {
-    void Run(const Options& options);
+    int Run(const Options& options);
 }
 
 #endif

tests/Simple/test-xml.bats

@@ -2,7 +2,7 @@
 
 @test "LineNumbers.c" {
     run ./build/duplo -xml tests/Simple/LineNumbers.lst out.xml
-    [ "$status" -eq 0 ]
+    [ "$status" -eq 1 ]
     [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
 }
 

tests/Simple/tests.bats

@@ -2,7 +2,7 @@
 
 @test "LineNumbers.c" {
     run ./build/duplo tests/Simple/LineNumbers.lst out.txt
-    [ "$status" -eq 0 ]
+    [ "$status" -eq 1 ]
     [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
     [ "${lines[1]}" = "tests/Simple/LineNumbers.c found: 1 block(s)" ]
 }

tests/Simple_Ada/tests.bats

@@ -2,13 +2,14 @@
 
 @test "simple_log.adb" {
     run ./build/duplo -ml 2 tests/Simple_Ada/simple_log.lst out.txt
-    [ "$status" -eq 0 ]
+    [ "$status" -eq 1 ]
     [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
     [ "${lines[1]}" = "tests/Simple_Ada/simple_log.adb found: 6 block(s)" ]
 }
 
 @test "simple_log.adb out.txt" {
-    ./build/duplo -ml 2 tests/Simple_Ada/simple_log.lst -
+    run ./build/duplo -ml 2 tests/Simple_Ada/simple_log.lst -
+    [ "$status" -eq 1 ]
     run diff <(cat tests/Simple_Ada/expected.log) <(./build/duplo -ml 2 tests/Simple_Ada/simple_log.lst -)
     [ "$status" -eq 0 ]
     printf 'Lines:\n'