diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ededda7..6c9cab9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,6 @@ jobs: sync: rsync prepare: pkg install -y binutils cmake elfutils python bash git python2 run: | - sudo ln -s /usr/local/bin/bash /bin/bash chmod u+x .github/workflows/freebsd-build.sh .github/workflows/ci-run-tests.sh .github/workflows/freebsd-build.sh x86_64 .github/workflows/ci-run-tests.sh diff --git a/.github/workflows/freebsd-build.sh b/.github/workflows/freebsd-build.sh index 4b9086a5..5427d363 100644 --- a/.github/workflows/freebsd-build.sh +++ b/.github/workflows/freebsd-build.sh @@ -17,6 +17,7 @@ run () { chmod u+x .github/workflows/test-executable.sh kcov --include-pattern=test-executable.sh coverage .github/workflows/test-executable.sh + cat coverage/test-executable.sh/coverage.json } run "$@" diff --git a/src/configuration.cc b/src/configuration.cc index 8d831a09..d2b73853 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -584,6 +584,7 @@ class Configuration : public IConfiguration setKey("python-command", "python"); #ifdef __FreeBSD__ setKey("bash-command", "/usr/local/bin/bash"); + setKey("bash-use-ps4", 1); #else setKey("bash-command", "/bin/bash"); #endif diff --git a/tests/tools/filter.py b/tests/tools/filter.py index 4a80eee0..387b60c6 100644 --- a/tests/tools/filter.py +++ b/tests/tools/filter.py @@ -29,6 +29,8 @@ def runTest(self): rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --include-path=" + testbase.sources + "/tests/bash/first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main") dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml") + f = open(testbase.outbase + "/kcov/shell-main/cobertura.xml").read() + print(f) assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1 assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) >= 1