tests: Try to make the solib test less fickle

SimonKagstrom · Jul 16, 2024 · 618a6cf · 618a6cf
1 parent 8b020af
commit 618a6cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/tests/shared-library/solib.c b/tests/shared-library/solib.c
@@ -7,7 +7,10 @@ int vobb(int a)
 	a = a + 1;
 
 	if (a > 2)
+	{
+		printf("a is greater than 2\n");
 		return 1;
+	}
 
 	return 0;
 }

diff --git a/tests/tools/test_compiled.py b/tests/tools/test_compiled.py
@@ -498,7 +498,7 @@ def runTest(self):
         assert cobertura.hitsPerLine(dom, "dlopen.cc", 11) == 1
         assert cobertura.hitsPerLine(dom, "dlopen.cc", 12) == 0
         assert cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert cobertura.hitsPerLine(dom, "solib.c", 12) == 0
+        assert cobertura.hitsPerLine(dom, "solib.c", 15) == 0
 
 
 class dlopen_in_ignored_source_file(libkcov.TestCase):
@@ -516,7 +516,7 @@ def runTest(self):
         dom = cobertura.parseFile(self.outbase + "/kcov/dlopen/cobertura.xml")
         assert cobertura.hitsPerLine(dom, "dlopen-main.cc", 10) == 1
         assert cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert cobertura.hitsPerLine(dom, "solib.c", 12) == 0
+        assert cobertura.hitsPerLine(dom, "solib.c", 15) == 0
 
 
 class daemon_no_wait_for_last_child(libkcov.TestCase):

diff --git a/tests/tools/test_compiled_basic.py b/tests/tools/test_compiled_basic.py
@@ -35,11 +35,10 @@ def runTest(self):
             + "/shared_library_test",
             False,
         )
-        self.skipTest("Fickle test, ignoring")
         assert rv == 0
 
         dom = cobertura.parseFile(self.outbase + "/kcov/shared_library_test/cobertura.xml")
-        assert cobertura.hitsPerLine(dom, "main.c", 9) == 1
+        assert cobertura.hitsPerLine(dom, "main.c", 9) >= 1
         assert cobertura.hitsPerLine(dom, "solib.c", 5) is None
 
 
@@ -74,7 +73,7 @@ def runTest(self):
         dom = cobertura.parseFile(self.outbase + "/kcov/shared_library_test/cobertura.xml")
         assert cobertura.hitsPerLine(dom, "main.c", 9) == 1
         assert cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert cobertura.hitsPerLine(dom, "solib.c", 10) == 1
+        assert cobertura.hitsPerLine(dom, "solib.c", 11) >= 1
 
 
 class MainTestBase(libkcov.TestCase):