further fixes to gcov tests.

disable very broken preprocessinator_includes_handler unit tests.
ThrowTheSwitch · Dec 11, 2023 · 0b644f6 · 0b644f6
1 parent 444deda
commit 0b644f6
Show file tree

Hide file tree

Showing 3 changed files with 270 additions and 271 deletions.
diff --git a/spec/gcov/gcov_deployment_spec.rb b/spec/gcov/gcov_deployment_spec.rb
@@ -54,12 +54,12 @@
               expect(@output).to match(/TESTED:\s+47/)
               expect(@output).to match(/PASSED:\s+47/)
 
-              expect(@output).to match(/AdcConductor\.c Lines executed:/i)
-              expect(@output).to match(/AdcHardware\.c Lines executed:/i)
-              expect(@output).to match(/AdcModel\.c Lines executed:/i)
-              expect(@output).to match(/Executor\.c Lines executed:/i)
-              expect(@output).to match(/Main\.c Lines executed:/i)
-              expect(@output).to match(/Model\.c Lines executed:/i)
+              expect(@output).to match(/AdcConductor\.c \| Lines executed:/i)
+              expect(@output).to match(/AdcHardware\.c \| Lines executed:/i)
+              expect(@output).to match(/AdcModel\.c \| Lines executed:/i)
+              expect(@output).to match(/Executor\.c \| Lines executed:/i)
+              expect(@output).to match(/Main\.c \| Lines executed:/i)
+              expect(@output).to match(/Model\.c \| Lines executed:/i)
               # there are more, but this is a good place to stop.
 
               expect(File.exist?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true

diff --git a/spec/gcov/gcov_test_cases_spec.rb b/spec/gcov/gcov_test_cases_spec.rb
@@ -216,7 +216,7 @@ def can_create_gcov_html_report_from_crashing_test_runner_with_enabled_debug_and
         expect(output).to match(/IGNORED:\s+0/)
         expect(output).to match(/example_file.c \| Lines executed:50.00% of 4/)
 
-        expect(gcov_html_report).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
+        expect(output).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
         expect(File.exist?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true
       end
     end
@@ -246,7 +246,7 @@ def can_create_gcov_html_report_from_crashing_test_runner_with_enabled_debug_and
         expect(output).to match(/IGNORED:\s+0/)
         expect(output).to match(/example_file.c \| Lines executed:0.00% of 4/)
 
-        expect(gcov_html_report).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
+        expect(output).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
         expect(File.exist?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true
       end
     end
@@ -280,7 +280,7 @@ def can_create_gcov_html_report_from_test_runner_with_enabled_debug_and_cmd_args
         expect(output).to match(/IGNORED:\s+0/)
         expect(output).to match(/example_file.c \| Lines executed:100.00% of 4/)
 
-        expect(gcov_html_report).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
+        expect(output).to match(/Creating HTML coverage report\(s\) with gcovr in 'build\/artifacts\/gcov'\.\.\. Done/)
         expect(File.exist?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true
       end
     end