Merge pull request #150 from nakengelhardt/fix_junit_type_assignment

note unexpected return statuses in junit

diff --combined tests/.gitignore
index 23d000849d886622aefc2e48115fb37ed990da18,c6bf5b56c0fd75fc7755f9ea5f660f454e4e05de..21f5f7806b9e58b73bb32f404d86f0484d69f475
--- 1/tests/.gitignore
--- 2/tests/.gitignore
+++ b/tests/.gitignore
@@@ -8,7 -8,7 +8,8 @@@
  /redxor*/
  /stopfirst*/
  /junit_*/
 +/keepgoing_*/
  /submod_props*/
  /multi_assert*/
  /aim_vs_smt2_nonzero_start_offset*/
+ /2props1trace*/

diff --combined tests/Makefile
index 46ec23b291a8b8fa371fb4961ad49ba03b4dc20f,15e87ff3ea21e1405df35d44a6a3a7a1882a5f5f..177688c0a4dc0b0ae6689534d3904d7e3ec77ffd
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -1,22 -1,20 +1,25 @@@
  SBY_FILES=$(wildcard *.sby)
  SBY_TESTS=$(addprefix test_,$(SBY_FILES:.sby=))
 +CHECK_PY_FILES=$(wildcard *.check.py)
 +CHECK_PY_TASKS=$(addprefix check_,$(CHECK_PY_FILES:.check.py=))
  JUNIT_TESTS=junit_assert_pass junit_assert_fail junit_assert_preunsat \
  junit_cover_pass junit_cover_uncovered junit_cover_assert junit_cover_preunsat \
  junit_timeout_error_timeout junit_timeout_error_syntax junit_timeout_error_solver
  
- .PHONY: test validate_junit
+ .PHONY: test validate_junit scripted
  
 -test: $(JUNIT_TESTS)
 +test: $(JUNIT_TESTS) $(CHECK_PY_TASKS)
  
  test_%: %.sby FORCE
        python3 ../sbysrc/sby.py -f $<
  
 +$(CHECK_PY_TASKS): check_%: %.check.py test_%
 +      python3 $<
 +
  $(JUNIT_TESTS): $(SBY_TESTS)
        python3 validate_junit.py $@/$@.xml
  
+ scripted:
+       make -C scripted
+ 
  FORCE: