From e4217ed4b175ad1e7601790dd229fc1d857eb463 Mon Sep 17 00:00:00 2001 From: Max Willsey Date: Fri, 12 Aug 2022 10:55:17 -0700 Subject: [PATCH] Fix cvc4 and xsv paths --- scripts/cvc4-eval/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/cvc4-eval/Makefile b/scripts/cvc4-eval/Makefile index ce204d3e..304b0b00 100644 --- a/scripts/cvc4-eval/Makefile +++ b/scripts/cvc4-eval/Makefile @@ -7,7 +7,10 @@ SHELL=/usr/bin/env bash all: rust-src=$(shell find ../../src/ -type f) -cvc4=./cvc4-1.8-x86_64-linux-opt \ + +# check for the hardcoded programs that are in the VM +xsv=$(shell command -v ./xsv || command -v xsv) +cvc4=$(shell command -v ./cvc4-1.8-x86_64-linux-opt || command -v cvc4) \ --sygus-rr-synth \ --sygus-rr-synth-check \ --no-sygus-sym-break \ @@ -98,11 +101,11 @@ latex-report: $(diffs) .PHONY: report report: $(diffs) - python3 compare.py $^ | ./xsv table + python3 compare.py $^ | $(xsv) table .PHONY: report-no-consts report-no-consts: $(diffs-no-consts) - python3 compare.py $^ | ./xsv table + python3 compare.py $^ | $(xsv) table .PHONY: latex-report-no-consts latex-report-no-consts: $(diffs-no-consts)