Skip to content

Fix the path to the wasm executable to match what the Makefile builds. #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2015
Merged

Fix the path to the wasm executable to match what the Makefile builds. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0b5c7
Fix the path to the wasm executable to match what the Makefile builds.
sunfishcode Sep 29, 2015
7585a2f
Change the travis build to use the Makefile.
sunfishcode Sep 30, 2015
c528464
Update runtests.py to use make instead of ocamlbuild.
sunfishcode Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ml-proto/runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ 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)

if __name__ == "__main__":
interpreterPath = os.path.abspath("./main.native")
interpreterPath = os.path.abspath("./wasm")

try:
os.makedirs("test/output/")
Expand Down
2 changes: 1 addition & 1 deletion ml-proto/travis/build-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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