From 5c0b5c7b2d3fb32d31adb72aa5a3e952a3ce10c5 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 29 Sep 2015 16:28:28 -0700 Subject: [PATCH 1/3] Fix the path to the wasm executable to match what the Makefile builds. --- ml-proto/runtests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py index a22feaee76..279fdb0536 100755 --- a/ml-proto/runtests.py +++ b/ml-proto/runtests.py @@ -58,7 +58,7 @@ def rebuild_interpreter(path): raise Exception("Interpreter has not been built. Looked for %s" % path) if __name__ == "__main__": - interpreterPath = os.path.abspath("./main.native") + interpreterPath = os.path.abspath("./wasm") try: os.makedirs("test/output/") From 7585a2f4f72087828f12fa7f6ca97972486600b5 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 30 Sep 2015 13:44:49 -0700 Subject: [PATCH 2/3] Change the travis build to use the Makefile. This avoids duplicating the ocamlbuild command-line, and creates an executable named wasm instead of "main.native". --- ml-proto/travis/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml-proto/travis/build-test.sh b/ml-proto/travis/build-test.sh index 3ccaaa70a0..ed1966e745 100755 --- a/ml-proto/travis/build-test.sh +++ b/ml-proto/travis/build-test.sh @@ -9,6 +9,6 @@ cd $(dirname ${BASH_SOURCE[0]})/.. export PATH=$PWD/../ocaml/install/bin:$PATH -ocamlbuild -libs "bigarray, str" -Is "given, spec, host" main.native +make ./runtests.py From c528464901166fc17c73cd57d70cdf8baedbf2a1 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 1 Oct 2015 08:00:33 -0700 Subject: [PATCH 3/3] Update runtests.py to use make instead of ocamlbuild. --- ml-proto/runtests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py index 279fdb0536..8e2e3920aa 100755 --- a/ml-proto/runtests.py +++ b/ml-proto/runtests.py @@ -51,9 +51,9 @@ def find_interpreter(path): def rebuild_interpreter(path): print("// building %s" % path) sys.stdout.flush() - exitCode = subprocess.call(["ocamlbuild", "-libs", "bigarray, str", "-Is", "given, spec, host", "-cflags", "-g", "host/main.native"]) + exitCode = subprocess.call(["make"]) if (exitCode != 0): - raise Exception("ocamlbuild failed with exit code %i" % exitCode) + raise Exception("make failed with exit code %i" % exitCode) if not os.path.exists(path): raise Exception("Interpreter has not been built. Looked for %s" % path)