diff --git a/test/Makefile b/test/Makefile index 01a3151..b3b7ea0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,9 +1,9 @@ CC=gcc -CFLAG= -c -g -O -I ../interpreter -o -objects=../interpreter/stack.o \ - ../interpreter/interpreter/core_methods.o \ - ../interpreter/interpreter/interpreter.o \ - ../interpreter/method_dispatcher/method_dispatcher.o \ +CFLAG= -c -g -O -I ../interpreter/interpreter -o +objects=../interpreter/interpreter/stack.o \ + ../interpreter/interpreter/interpreter/core_methods.o \ + ../interpreter/interpreter/interpreter/interpreter.o \ + ../interpreter/interpreter/method_dispatcher/method_dispatcher.o \ main.o @@ -12,7 +12,7 @@ clean: - rm code.bin - rm main lib: - cd ../interpreter && make -s + cd ../interpreter/interpreter && make -s %.o: %.c $(CC) $(CFLAG) $@ $< @@ -21,7 +21,7 @@ main: main.o $(CC) -O -g $(objects) -o main test: main code.bin - cd ../assembler && make test + cd ../assembler/assembler && make test valgrind ./main code.bin: diff --git a/test/test.py b/test/test.py index cf1a6ef..23998cc 100644 --- a/test/test.py +++ b/test/test.py @@ -1,7 +1,7 @@ import sys from io import StringIO -sys.path.append("../assembler") +sys.path.append("../assembler/assembler") from assembler.assembler import Assembler