From 900db6294298c1eeb8110b73ef8dafc8175ef4a1 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Mon, 18 Sep 2017 16:02:57 +0200
Subject: Making progress on the automated testing...

---
 data/test/Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'data/test/Makefile')

diff --git a/data/test/Makefile b/data/test/Makefile
index 43e2232..de460c3 100644
--- a/data/test/Makefile
+++ b/data/test/Makefile
@@ -7,15 +7,16 @@ SOLUTION_DIR ?= /tmp/tabellion/sol/
 ORACLE_CREATOR_SCRIPT = ${CURDIR}/oracle_creator.py
 ################################################################################
 TEST_FILES = $(addsuffix /valid,$(TEST_DIRS))
+SOLUTION_FILES = $(addsuffix .sol,$(addprefix $(SOLUTION_DIR)/,$(TEST_DIRS)))
 
 #VHD_FILES = $(addsuffix .vhd, $(TEST_FILES))
 AST_FILES = $(addsuffix .xml, $(TEST_FILES))
 OCL_FILES = $(addsuffix .ocl, $(TEST_FILES))
+RSL_FILES = $(addsuffix .rsl, $(TEST_DIRS))
 
-all: $(AST_FILES) $(OCL_FILES)
-	for TD in $(TEST_DIRS) ; do \
-		$(MAKE) -C $$TD PROPERTY_FILES=$$TD.pro
-		
+export
+
+all: $(AST_FILES) $(OCL_FILES) $(RSL_FILES)
 
 clean:
 	rm -f $(AST_FILES)
@@ -27,4 +28,8 @@ $(AST_FILES): %.xml : %.vhd
 $(OCL_FILES): %.ocl : %.vhd
 	grep -no "\$$SOL:[0-9]\+:[0-9]\+\\$$" $< | $(ORACLE_CREATOR_SCRIPT) > $@
 
-
+$(RSL_FILES): %.rsl : %/valid.ocl %/valid.xml
+	$(MAKE) -C $(TABELLION_MAIN) \
+		AST_FILE=${PWD}/$(patsubst %.rsl,%,$@)/valid.xml \
+		PROPERTY_FILES=$(PROPERTY_DIR)/$(patsubst %.rsl,%.pro,$@) \
+		TEMPLATE_DIR=${PWD}/$(patsubst %.rsl,%,$@)/
-- 
cgit v1.2.3-70-g09d2