fix lift.mk

src/test/make/lift.mk

@@ -13,8 +13,11 @@ BASIL_SPECARG = --spec $(SPEC)
 endif
 
 # optional; create basil
-$(NAME).bpl: $(LIFT_ARTEFACTS) $(SPEC) $(BASIL)
-	java -jar $(BASIL) $(BASIL_FLAGS) --adt $(NAME).adt --relf $(NAME).relf -o $(NAME).expected $(BASIL_SPECARG)
+$(NAME)_bap.bpl: $(LIFT_ARTEFACTS) $(SPEC) $(BASIL)
+	java -jar $(BASIL) $(BASIL_FLAGS) --input $(NAME).adt --relf $(NAME).relf -o $(NAME)_bap.bpl $(BASIL_SPECARG)
+
+$(NAME)_gtirb.bpl: $(LIFT_ARTEFACTS) $(SPEC) $(BASIL)
+    java -jar $(BASIL) $(BASIL_FLAGS) --input $(NAME).gts --relf $(NAME).relf -o $(NAME)_gtirb.bpl $(BASIL_SPECARG)
 
 .PHONY=$(BASIL)
 $(BASIL): 
@@ -26,21 +29,29 @@ a.out: $(C_SOURCE)
 	$(CC) $(CFLAGS) $(C_SOURCE)
 
 .PHONY=recompile verify clean cleanlift cleanall cleanbin
-verify: $(NAME).bpl
+verify: $(NAME)_bap.bpl $(NAME)_gtirb.bpl
 
 recompile: a.out
 
-$(NAME)_result.txt: $(NAME).bpl $(EXTRA_SPEC)
-	bash -c "time boogie $(NAME).bpl $(EXTRA_SPEC) $(BOOGIE_FLAGS) | tee $(NAME)_result.txt"
+$(NAME)bap_result.txt: $(NAME)_bap.bpl $(EXTRA_SPEC)
+	bash -c "time boogie $(NAME)_bap.bpl $(EXTRA_SPEC) $(BOOGIE_FLAGS) | tee $(NAME)_result.txt"
+
+$(NAME)gtirb_result.txt: $(NAME)_gtirb.bpl $(EXTRA_SPEC)
+    bash -c "time boogie $(NAME)_gtirb.bpl $(EXTRA_SPEC) $(BOOGIE_FLAGS) | tee $(NAME)_result.txt"
 
 cleanall: clean cleanlift cleanbin cleantest
 
 cleantest: 
 	rm -rf $(NAME).bpl
+    rm -rf $(NAME)_bap.bpl
+    rm -rf $(NAME)_gtirb.bpl
 	rm -rf $(NAME)_result.txt
+    rm -rf $(NAME)bap_result.txt
+    rm -rf $(NAME)gtirb_result.txt
 
 cleanbin:
 	rm -rf a.out
+	rm -rf $(NAME).gtirb
 
 clean: cleanlift cleanbin