13 files changed, 8 insertions, 5 deletions
diff --git a/data/property/cnes/CNE_00100.pro b/data/property/CNE_00100.pro
index 1b0893e..1b0893e 100644
--- a/data/property/cnes/CNE_00100.pro
+++ b/data/property/CNE_00100.pro
diff --git a/data/property/cnes/CNE_01100.pro b/data/property/CNE_01100.pro
index ddeb4e3..ddeb4e3 100644
--- a/data/property/cnes/CNE_01100.pro
+++ b/data/property/CNE_01100.pro
diff --git a/data/property/cnes/CNE_01200.pro b/data/property/CNE_01200.pro
index 6649103..6649103 100644
--- a/data/property/cnes/CNE_01200.pro
+++ b/data/property/CNE_01200.pro
diff --git a/data/property/cnes/CNE_01400.pro b/data/property/CNE_01400.pro
index 412650e..412650e 100644
--- a/data/property/cnes/CNE_01400.pro
+++ b/data/property/CNE_01400.pro
diff --git a/data/property/cnes/CNE_01700.pro b/data/property/CNE_01700.pro
index db5e676..db5e676 100644
--- a/data/property/cnes/CNE_01700.pro
+++ b/data/property/CNE_01700.pro
diff --git a/data/property/cnes/CNE_01800.pro b/data/property/CNE_01800.pro
index fe69841..fe69841 100644
--- a/data/property/cnes/CNE_01800.pro
+++ b/data/property/CNE_01800.pro
diff --git a/data/property/cnes/CNE_01900.pro b/data/property/CNE_01900.pro
index 51c373f..51c373f 100644
--- a/data/property/cnes/CNE_01900.pro
+++ b/data/property/CNE_01900.pro
diff --git a/data/property/cnes/CNE_02100.pro b/data/property/CNE_02100.pro
index 8b66f0b..8b66f0b 100644
--- a/data/property/cnes/CNE_02100.pro
+++ b/data/property/CNE_02100.pro
diff --git a/data/property/cnes/CNE_02600.pro b/data/property/CNE_02600.pro
index f4f89ab..f4f89ab 100644
--- a/data/property/cnes/CNE_02600.pro
+++ b/data/property/CNE_02600.pro
diff --git a/data/property/cnes/CNE_04500.pro b/data/property/CNE_04500.pro
index 383aec0..383aec0 100644
--- a/data/property/cnes/CNE_04500.pro
+++ b/data/property/CNE_04500.pro
diff --git a/data/property/cnes/CNE_05100.pro b/data/property/CNE_05100.pro
index dd8b2c1..dd8b2c1 100644
--- a/data/property/cnes/CNE_05100.pro
+++ b/data/property/CNE_05100.pro
diff --git a/data/property/cnes/STD_04800.pro b/data/property/STD_04800.pro
index ae8e4c9..ae8e4c9 100644
--- a/data/property/cnes/STD_04800.pro
+++ b/data/property/STD_04800.pro
diff --git a/data/test/Makefile b/data/test/Makefile
index f38526a..eec299d 100644
--- a/data/test/Makefile
+++ b/data/test/Makefile
@@ -22,6 +22,9 @@ all: $(AST_FILES) $(OCL_FILES) $(VLD_FILES) $(IVLD_FILES)
 clean:
 	rm -f $(AST_FILES)
 	rm -f $(OCL_FILES)
+	rm -f $(VLD_FILES)
+	rm -f $(IVLD_FILES)
+	rm -rf /tmp/tabellion_{,in}valid
 
 $(AST_FILES): %.xml : %.vhd
 	$(AST_CREATOR) $< > $@
@@ -41,9 +44,9 @@ $(VLD_FILES): %/valid.result: %/valid.ocl %/valid.xml
 		AST_FILE=${PWD}/$(dir $@)/valid.xml \
 		PROPERTY_FILES=$(PROPERTY_DIR)/$(patsubst %/,%,$(dir $@)).pro \
 		TEMPLATE_DIR=${PWD}/$(dir $@)/ \
-		NICE_MESSAGE=/tmp/tabellion/valid_test_result
-	cat /tmp/tabellion/valid_test_result | sed '/^\s*$$/d' | sort > $@
-	diff $@ $(dir $@)/valid.ocl || true > $@
+		NICE_MESSAGE=/tmp/tabellion_valid/result
+	cat /tmp/tabellion_valid/result | sed '/^\s*$$/d' | sort > /tmp/tabellion_valid/result_clean
+	-diff /tmp/tabellion_valid/result_clean $(dir $@)/valid.ocl > $@
 
 $(IVLD_FILES): %/invalid.result: %/invalid.ocl %/invalid.xml
 	$(MAKE) -C $(TABELLION_MAIN) \
@@ -57,5 +60,5 @@ $(IVLD_FILES): %/invalid.result: %/invalid.ocl %/invalid.xml
 		AST_FILE=${PWD}/$(dir $@)/invalid.xml \
 		PROPERTY_FILES=$(PROPERTY_DIR)/$(patsubst %/,%,$(dir $@)).pro \
 		TEMPLATE_DIR=${PWD}/$(dir $@)/ \
-		NICE_MESSAGE=${PWD}/$@
-	cat $@ | sed '/^\s*$$/d' | sort > $@
+		NICE_MESSAGE=/tmp/tabellion_invalid/result
+	cat /tmp/tabellion_invalid/result | sed '/^\s*$$/d' | sort > $@