diff --git a/regression-tests/test_db.json b/regression-tests/test_db.json index 4ed1bcc..e6c149b 100644 --- a/regression-tests/test_db.json +++ b/regression-tests/test_db.json @@ -276,7 +276,7 @@ "exit_code": 0, "stdin_lines": [], "stdout_lines": [ - "3/4", + "1/4", "1/4", "1", "3/10" @@ -285,4 +285,4 @@ } ] } -] \ No newline at end of file +] diff --git a/scripts/build.mk b/scripts/build.mk index 0a796e5..c49e1ad 100755 --- a/scripts/build.mk +++ b/scripts/build.mk @@ -20,9 +20,9 @@ bin/$(os)/builtin_function_documentation.cc: musique/interpreter/builtin_functio Debug_Obj=$(addprefix bin/$(os)/debug/,$(Obj)) bin/$(os)/debug/builtin_function_documentation.o -bin/$(os)/debug/$(Target): $(Debug_Obj) bin/$(os)/debug/main.o bin/$(os)/rtmidi.o $(Bestline) +bin/$(os)/debug/$(Target): $(Debug_Obj) bin/$(os)/debug/main.o bin/$(os)/rtmidi.o @echo "CXX $@" - @$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(CPPFLAGS) -o $@ $(Debug_Obj) bin/$(os)/rtmidi.o $(Bestline) $(LDFLAGS) $(LDLIBS) + @$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(CPPFLAGS) -o $@ $(Debug_Obj) bin/$(os)/rtmidi.o $(shell CXX=$(CXX) os=$(os) scripts/build_replxx.sh) $(LDFLAGS) $(LDLIBS) bin/$(os)/debug/%.o: musique/%.cc @echo "CXX $@" diff --git a/scripts/test.py b/scripts/test.py index 9776699..4bc4124 100755 --- a/scripts/test.py +++ b/scripts/test.py @@ -26,7 +26,7 @@ class TestCase: def run(self, interpreter: str, source: str, cwd: str): result = subprocess.run( - args=[interpreter, source, "-q"], + args=[interpreter, "run", source], capture_output=True, cwd=cwd, text=True