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.
This commit is contained in:
parent
2a0d2f9b65
commit
0b90c17a8c
|
@ -91,7 +91,6 @@ test_script:
|
|||
rmdir /s /q jbmc\classpath1
|
||||
rmdir /s /q jbmc\jar-file3
|
||||
rmdir /s /q jbmc\tableswitch2
|
||||
rmdir /s /q jbmc-concurrency\explicit_thread_blocks
|
||||
cd ../..
|
||||
|
||||
make -C jbmc/regression test
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
CORE
|
||||
Test.class
|
||||
--classpath `./format_classpath.sh . annotations correct-overlay` --verbosity 10
|
||||
--classpath `../../../../scripts/format_classpath.sh . annotations correct-overlay` --verbosity 10
|
||||
^Getting class `Test' from file \.[\\/]Test\.class$
|
||||
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
|
||||
^Adding symbol from overlay class: field 'x'$
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
CORE
|
||||
Test.class
|
||||
--classpath `./format_classpath.sh . annotations . correct-overlay` --verbosity 10
|
||||
--classpath `../../../../scripts/format_classpath.sh . annotations . correct-overlay` --verbosity 10
|
||||
^Getting class `Test' from file \.[\\/]Test\.class$
|
||||
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
|
||||
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
CORE
|
||||
Test.class
|
||||
--classpath `./format_classpath.sh annotations correct-overlay .` --verbosity 10
|
||||
--classpath `../../../../scripts/format_classpath.sh annotations correct-overlay .` --verbosity 10
|
||||
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
|
||||
^Getting class `Test' from file \.[\\/]Test\.class$
|
||||
^Skipping class Test marked with OverlayClassImplementation but found before original definition$
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
CORE
|
||||
Test.class
|
||||
--classpath `./format_classpath.sh . annotations unmarked-overlay` --verbosity 10
|
||||
--classpath `../../../../scripts/format_classpath.sh . annotations unmarked-overlay` --verbosity 10
|
||||
^Getting class `Test' from file \.[\\/]Test\.class$
|
||||
^Getting class `Test' from file unmarked-overlay[\\/]Test\.class$
|
||||
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
|
||||
|
|
Loading…
Reference in New Issue