From 92c4ffbfe3f1e1759a850fef4aa9ef134877385d Mon Sep 17 00:00:00 2001 From: Peter Sewell Date: Wed, 13 Aug 2014 12:27:20 +0100 Subject: Kathy, Peter tweak Makefile for interactive demo and src/myocamlbuild.ml to temporarily use other version of Lem --- src/Makefile | 9 +++++++++ src/myocamlbuild.ml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 4e6257d6..21e821ea 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,6 +18,15 @@ test_power: power #../../../rsem/idl/power/binary/run.sh ./run_power.native --file ../../../rsem/idl/power/binary/main.bin +test_power_interactive: power + ./run_power.native --interactive --file ../../../rsem/idl/power/binary/main.bin + +test_power_interactive_srcs: + ebig ~/rsem/idl/power/generated/power.sail ../../../rsem/idl/power/binary/hello.c ../../../rsem/idl/power/binary/hello.s + +# or test/power.sail for cut-down one + + test_idempotence: sail @cd test; for file in *.sail; do \ ./idempotence.sh $$file; echo ;\ diff --git a/src/myocamlbuild.ml b/src/myocamlbuild.ml index 4c5505ee..01171838 100644 --- a/src/myocamlbuild.ml +++ b/src/myocamlbuild.ml @@ -16,7 +16,7 @@ let split ch s = go s (* paths relative to _build *) -let lem_dir = "../../../lem" ;; +let lem_dir = "../../../../bitbucket-lem-for-sail/lem" ;; let lem_libdir = lem_dir / "ocaml-lib/_build" ;; let lem_lib = lem_libdir / "extract" ;; let lem = lem_dir / "lem" ;; -- cgit v1.2.3