fix: Fix naming for coverage-related files (#186)

* fix: Fix naming for coverage-related files

Author: misonijnik

test/Industry/CoverageBranches/ChenFlurMukhopadhyay-2012SAS-Fig1-alloca.c

@@ -3,7 +3,7 @@
 // RUN: %klee --output-dir=%t.klee-out --optimize-aggressive=false --track-coverage=branches --optimize=true --delete-dead-loops=false --use-forked-solver=false --max-memory=6008 --cex-cache-validity-cores --only-output-states-covering-new=true --dump-states-on-halt=all %t1.bc 2>&1 | FileCheck -check-prefix=CHECK %s
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 

test/Industry/CoverageBranches/CostasArray-17.c

@@ -3,7 +3,7 @@
 // RUN: %klee --output-dir=%t.klee-out --optimize-aggressive --track-coverage=branches --optimize=true --emit-all-errors --only-output-states-covering-new=true --dump-states-on-halt=all --search=dfs %t1.bc
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 
@@ -13,7 +13,7 @@
 // RUN: %klee --output-dir=%t.klee-out --optimize-aggressive=false --track-coverage=branches --optimize=true --emit-all-errors --only-output-states-covering-new=true --dump-states-on-halt=all --search=dfs %t1.bc
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 
@@ -1769,4 +1769,4 @@ int main() {
                y[115]133 y[116]134 y[117]135 y[118]136 y[119]137 y[120]138
                y[121]139 y[122]140 y[123]141 y[124]142 y[125]143 y[126]144
                y[127]145 y[128]146 y[129]147 y[130]148 y[131]149 y[132] */
-}
+}

test/Industry/CoverageBranches/egcd3-ll_valuebound10.c

@@ -3,7 +3,7 @@
 // RUN: %klee --output-dir=%t.klee-out --delete-dead-loops=false --emit-all-errors --mock-policy=all --use-forked-solver=false --max-memory=6008 --optimize --skip-not-lazy-initialized --output-source=false --output-stats=true --output-istats=true -istats-write-interval=90s --use-sym-size-alloc=true --cex-cache-validity-cores --symbolic-allocation-threshold=8192 --max-solver-time=5s --track-coverage=branches --use-iterative-deepening-search=max-cycles --cover-on-the-fly=false --delay-cover-on-the-fly=400000 --only-output-states-covering-new --dump-states-on-halt=all --search=dfs --search=random-state %t1.bc
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 

test/Industry/CoverageBranches/matrix-2-2.c

@@ -3,7 +3,7 @@
 // RUN: %klee --output-dir=%t.klee-out --optimize-aggressive=false --track-coverage=all --max-cycles=2 --optimize=true --emit-all-errors --delete-dead-loops=false --use-forked-solver=false --max-memory=6008 --cex-cache-validity-cores --only-output-states-covering-new=true --dump-states-on-halt=all --use-sym-size-alloc=true --symbolic-allocation-threshold=8192 %t1.bc 2>&1
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 

test/Industry/CoverageBranches/pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label00.c

@@ -3,7 +3,7 @@
 // RUN: %klee --output-dir=%t.klee-out --optimize-aggressive=false --track-coverage=branches --delete-dead-loops=false --emit-all-errors --mock-policy=all --use-forked-solver=false --optimize --skip-not-lazy-initialized --output-source=false --output-stats=false --output-istats=false -istats-write-interval=3s --use-sym-size-alloc=true --cex-cache-validity-cores --symbolic-allocation-threshold=8192 --cover-on-the-fly=false --delay-cover-on-the-fly=400000 --only-output-states-covering-new --dump-states-on-halt=all --search=dfs --search=random-state --use-iterative-deepening-search=max-cycles --max-cycles=4 %t1.bc
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 

test/Industry/egcd3-ll_valuebound10.c

@@ -4,7 +4,7 @@
 // RUN: %klee --output-dir=%t.klee-out --delete-dead-loops=false --emit-all-errors --mock-policy=all --use-forked-solver=false --max-memory=6008 --optimize --skip-not-lazy-initialized --output-source=false --output-stats=true --output-istats=true -istats-write-interval=90s --use-sym-size-alloc=true --cex-cache-validity-cores --symbolic-allocation-threshold=8192 --max-solver-time=5s --track-coverage=branches --use-iterative-deepening-search=max-cycles --cover-on-the-fly=false --delay-cover-on-the-fly=400000 --only-output-states-covering-new --dump-states-on-halt=all --search=dfs --search=random-state %t1.bc
 
 // RUN: rm -f ./%gcov-files-path*.gcda ./%gcov-files-path*.gcno ./%gcov-files-path*.gcov
-// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner --coverage
+// RUN: %cc -DGCOV %s %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner %gcov-options
 // RUN: %replay %t.klee-out %t_runner
 // RUN: gcov -b %gcov-files-path > %t.cov.log
 

test/lit.cfg

@@ -196,14 +196,13 @@ config.substitutions.append(
 config.substitutions.append(
     ('%libcxx_include', getattr(config, 'libcxx_include_dir', None)))
 
-if config.target_triple.find("darwin") != -1:
-  config.substitutions.append(
-    ('%gcov-files-path', '%basename_t')
-  )
-else:
-  config.substitutions.append(
-    ('%gcov-files-path', '%t_runner-%basename_t')
-  )
+config.substitutions.append(
+  ('%gcov-options', '--coverage -dumpbase "" -dumpdir ""')
+)
+
+config.substitutions.append(
+  ('%gcov-files-path', '%basename_t')
+)
 
 # Add feature for the LLVM version in use, so it can be tested in REQUIRES and
 # XFAIL checks. We also add "not-XXX" variants, for the same reason.