Skip to content

Commit 64c15bc

Browse files
Degiorgiocesaro
authored andcommitted
JBMC: Moved format_classpath.sh to scripts/format_classpath.sh
'format_classpath.sh' is used in regression tests that make use of the 'classpath' option. This script is needed to deal with the fact that classpath syntex is OS-dependent. The java concurrency regression tests make heavy use of this option as such this commit moves 'format_classpath.sh' to 'scripts/format_classpath.sh'. Furthermore, this commit makes a very small change to 'appveyor.yml' that enables existing java concurrency regression tests to run on Windows.
1 parent 90c56b3 commit 64c15bc

File tree

6 files changed

+4
-5
lines changed

6 files changed

+4
-5
lines changed

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ test_script:
9090
rmdir /s /q jbmc\classpath1
9191
rmdir /s /q jbmc\jar-file3
9292
rmdir /s /q jbmc\tableswitch2
93-
rmdir /s /q jbmc-concurrency\explicit_thread_blocks
9493
cd ../..
9594
9695
make -C jbmc/regression test

jbmc/regression/jbmc/overlay-class/correct-test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
Test.class
3-
--classpath `./format_classpath.sh . annotations correct-overlay` --verbosity 10
3+
--classpath `../../../../scripts/format_classpath.sh . annotations correct-overlay` --verbosity 10
44
^Getting class `Test' from file \.[\\/]Test\.class$
55
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
66
^Adding symbol from overlay class: field 'x'$

jbmc/regression/jbmc/overlay-class/duplicate-test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
Test.class
3-
--classpath `./format_classpath.sh . annotations . correct-overlay` --verbosity 10
3+
--classpath `../../../../scripts/format_classpath.sh . annotations . correct-overlay` --verbosity 10
44
^Getting class `Test' from file \.[\\/]Test\.class$
55
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
66
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$

jbmc/regression/jbmc/overlay-class/misordered-test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
Test.class
3-
--classpath `./format_classpath.sh annotations correct-overlay .` --verbosity 10
3+
--classpath `../../../../scripts/format_classpath.sh annotations correct-overlay .` --verbosity 10
44
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
55
^Getting class `Test' from file \.[\\/]Test\.class$
66
^Skipping class Test marked with OverlayClassImplementation but found before original definition$

jbmc/regression/jbmc/overlay-class/unmarked-test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
Test.class
3-
--classpath `./format_classpath.sh . annotations unmarked-overlay` --verbosity 10
3+
--classpath `../../../../scripts/format_classpath.sh . annotations unmarked-overlay` --verbosity 10
44
^Getting class `Test' from file \.[\\/]Test\.class$
55
^Getting class `Test' from file unmarked-overlay[\\/]Test\.class$
66
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$

0 commit comments

Comments
 (0)