Skip to content

Commit 25c87bc

Browse files
tautschnigtautschnig
committed
goto-instrument-wmm tests: minimisation requires glpk
Tag all *_OPT tests "glpk" and exclude them from test runs by default as we don't currently build with glpk by default.
1 parent be58114 commit 25c87bc

File tree

1,385 files changed

+1390
-1390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,385 files changed

+1390
-1390
lines changed

‎regression/goto-instrument-wmm-core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ else()
55
endif()
66

77
add_test_pl_tests(
8-
"${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:goto-instrument> $<TARGET_FILE:cbmc> ${is_windows}"
8+
"${CMAKE_CURRENT_SOURCE_DIR}/chain.sh $<TARGET_FILE:goto-cc> $<TARGET_FILE:goto-instrument> $<TARGET_FILE:cbmc> ${is_windows}" -X glpk
99
)

‎regression/goto-instrument-wmm-core/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ else
1212
endif
1313

1414
testalpha:
15-
@../test.pl -C -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
15+
@../test.pl -C -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
1616

1717
testbeta:
18-
@../test.pl -T -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
18+
@../test.pl -T -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
1919

2020
testimpr:
21-
@../test.pl -K -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
21+
@../test.pl -K -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
2222

2323
testnew:
24-
@../test.pl -F -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
24+
@../test.pl -F -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
2525

2626
test:
27-
@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
27+
@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
2828

2929
tests.log:
30-
@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
30+
@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' -X glpk
3131

3232
clean:
3333
find . -name '*.out' -execdir $(RM) '{}' \;

‎regression/goto-instrument-wmm-core/ppc_aclwdrr000_POWER_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr000.c
33
POWER OPT
44
^EXIT=10$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr000_PSO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr000.c
33
PSO OPT
44
^EXIT=0$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr000_RMO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr000.c
33
RMO OPT
44
^EXIT=0$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr000_TSO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr000.c
33
TSO OPT
44
^EXIT=0$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr001_POWER_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr001.c
33
POWER OPT
44
^EXIT=10$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr001_PSO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr001.c
33
PSO OPT
44
^EXIT=0$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr001_RMO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr001.c
33
RMO OPT
44
^EXIT=0$

‎regression/goto-instrument-wmm-core/ppc_aclwdrr001_TSO_OPT/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
THOROUGH
1+
THOROUGH glpk
22
aclwdrr001.c
33
TSO OPT
44
^EXIT=0$

0 commit comments

Comments
 (0)