diff --git a/tools/ptests/.gitignore b/tools/ptests/.gitignore index 0f6dcce059df79a4688dd572e4e159126ff7e313..0d183328a0be2309eef8d8759cadb39e013c00c7 100644 --- a/tools/ptests/.gitignore +++ b/tools/ptests/.gitignore @@ -1 +1,3 @@ /ptests_config.ml +/tests/cmd/tests/without-test_config/result +/tests/nothing/tests/basic/result/ diff --git a/tools/ptests/ptests.ml b/tools/ptests/ptests.ml index 70b15a30939e721576038a52be0c196560acea76..fa3f15ea40eb681d6cb538e206e95d5b10d68615 100644 --- a/tools/ptests/ptests.ml +++ b/tools/ptests/ptests.ml @@ -1340,7 +1340,7 @@ let print_json_wrapper ~file wtest = if !verbosity >= 2 then Format.printf "%% Generates %S wrapper file...@." file; let wrapper_cout = open_out file in let wrapper_fmt = Format.formatter_of_out_channel wrapper_cout in - Format.fprintf wrapper_fmt "%a@" (pp_wtest ~compacted:false) wtest; + Format.fprintf wrapper_fmt "%a@." (pp_wtest ~compacted:false) wtest; close_out wrapper_cout let oracle_target oracle_fmt dir fname = diff --git a/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.0.res.oracle b/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.0.res.oracle index 838408a108b6ae2b4023b87a8295851fd938c979..eec2aa08e3467afa4410cb5db686cb97050131dc 100644 --- a/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.0.res.oracle +++ b/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.0.res.oracle @@ -1 +1 @@ -PTEST_DIR=./tests/cmd/tests/without-test_config PTEST_NAME=ptest-macros.i PTEST_RESULT=./tests/cmd/tests/without-test_config/result PTEST_NAME=ptest-macros PTEST_NUMBER=0 +PTEST_DIR=. PTEST_NAME=ptest-macros.i PTEST_RESULT=. PTEST_NAME=ptest-macros PTEST_NUMBER=0 diff --git a/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.1.res.oracle b/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.1.res.oracle index 0de87067da3acde56cc5de10be6e622c06d70766..bc2b3a993f024032d898fa21437ed7c6c6bc076c 100644 --- a/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.1.res.oracle +++ b/tools/ptests/tests/cmd/tests/without-test_config/oracle/ptest-macros.1.res.oracle @@ -1 +1 @@ -PTEST_DIR=./tests/cmd/tests/without-test_config PTEST_NAME=ptest-macros.i PTEST_RESULT=./tests/cmd/tests/without-test_config/result PTEST_NAME=ptest-macros PTEST_NUMBER=1 +PTEST_DIR=. PTEST_NAME=ptest-macros.i PTEST_RESULT=. PTEST_NAME=ptest-macros PTEST_NUMBER=1 diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle index 628d824bcc72487d0ad5d112e8c641821542873c..e313fcfad133f712645760af8da197f7aaf34ea0 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle @@ -1 +1 @@ -frama-c default-options:=-journal-disable -check -no-autoload-plugins:= empty.i +frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= empty.i diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle index 96766a95c44ac79a516f84c6dd217f34150ab2ba..f9923bff22b36aba0e6131a43dcf069a3a985188 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle @@ -1 +1 @@ -frama-c default-options:=-journal-disable -check -no-autoload-plugins:= opt.i -- OPT No0: number=0 name=opt file=opt.i +frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= -- OPT No0: number=0 name=opt file=opt.i diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle index 8b4c69848ac8b58f39653f85fa3a168ef47bdcda..ea8b71c4d6736982c0ae697f99f08e2fe54c13a8 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle @@ -1 +1 @@ -frama-c default-options:=-journal-disable -check -no-autoload-plugins:= opt.i -- OPT No1: number=1 +frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= opt.i -- OPT No1: number=1