tests: Relax issue SimonKagstrom#31 test for clang

clayne · Jan 28, 2016 · 0cdc725 · 0cdc725
1 parent 80e01d5
commit 0cdc725
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -102,6 +102,7 @@ add_executable(setpgid-kill setpgid-kill/setpgid-kill-main.cc ../src/utils.cc)
 add_executable(issue31 daemon/test-issue31.cc)
 add_executable(dlopen dlopen/dlopen.cc dlopen/dlopen-main.cc)
 add_executable(s short-file.c)
+add_executable(lock-prefix assembly/lock-prefix.c)
 
 add_executable(pie pie.c)
 set_target_properties(pie PROPERTIES COMPILE_FLAGS "-g -fpie -fPIE")

diff --git a/tests/bash/shell-main b/tests/bash/shell-main
@@ -150,3 +150,6 @@ echo "Covered?"
 
 id="# ${work_runtime_error}."
 echo afterid
+
+source `dirname $0`/first-dir/c.sh
+source `dirname $0`/first-dir/b.sh
diff --git a/tests/tools/compiled.py b/tests/tools/compiled.py
@@ -269,8 +269,8 @@ def runTest(self):
         self.setUp()
         rv,o = self.do(testbase.sources + "/tests/daemon/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/issue31", False)
         dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/issue31/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 28) == 1
-        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 11) == 1
+        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 28) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 11) >= 1
         assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 8) == 0
 
 class merge_same_file_in_multiple_binaries(testbase.KcovTestCase):