Commits

art_haali committed 0224745

forgotten conflict resolve

Comments (0)

Files changed (1)

benchmarking/performance_test.sh

          #------------------------------------------------------------------------------
          # BEGIN model checking
          echo -n " Model checking the synthesis result ... "
-<<<<<<< HEAD
-         #${GNU_TIME} --quiet --output=${RES_TXT_FILE} -a -f "Model-checking time: %e sec (Real time) / %U sec (User CPU time)" $MODEL_CHECKER $outfile_path > /dev/null 2>&1
          ${GNU_TIME} --quiet --output=${RES_TXT_FILE} -a -f "Model-checking time: %e sec (Real time) / %U sec (User CPU time)" $MODEL_CHECKER $outfile_path 
-=======
-         ${GNU_TIME} --quiet --output=${RES_TXT_FILE} -a -f "Model-checking time: %e sec (Real time) / %U sec (User CPU time)" $MODEL_CHECKER $MODEL_CHECKER_OPTIONS $outfile_path > /dev/null 2>&1
->>>>>>> f40a9fdc0ae6743af040c08c267593c56715c3c1
          check_res=$?
          echo " done. "
          echo "result is $check_res"