From 5e35117f8dd7cc4c548ecd704e11f3ca8845dedd Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Wed, 11 Apr 2018 10:54:56 +0200
Subject: MPPA - reorganized the test directory

---
 test/mppa/Makefile | 23 ++++++++++++++---------
 test/mppa/check.sh |  8 ++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'test/mppa')

diff --git a/test/mppa/Makefile b/test/mppa/Makefile
index c02f8d94..f8b3f68c 100644
--- a/test/mppa/Makefile
+++ b/test/mppa/Makefile
@@ -1,25 +1,30 @@
 DIR=general
+BINDIR=bin
+ASMDIR=asm
 TESTNAMES=simple call branch for forvar forvarl branchz branchzu
 
 CCOMP=../../ccomp
-TESTS=$(addprefix $(DIR)/,$(TESTNAMES))
-ELF=$(addsuffix .bin,$(TESTS))
-TOK=$(addsuffix .tok,$(TESTS))
-ASM=$(addsuffix .s,$(TESTS))
+#TESTS=$(addprefix $(DIR)/,$(TESTNAMES))
+ELF=$(addprefix $(DIR)/$(BINDIR)/,$(addsuffix .bin,$(TESTNAMES)))
+TOK=$(addprefix $(DIR)/$(BINDIR)/,$(addsuffix .tok,$(TESTNAMES)))
+ASM=$(addprefix $(DIR)/$(ASMDIR)/,$(addsuffix .s,$(TESTNAMES)))
 DEBUG:=$(if $(DEBUG),"-dall",)
 
 all: $(ELF)
 
 nobin: $(ASM)
 
-$(DIR)/%.bin: $(DIR)/%.s
+$(DIR)/$(BINDIR)/%.bin: $(DIR)/$(ASMDIR)/%.s
+	@mkdir -p $(@D)
 	k1-gcc $< -o $@
 
 .SECONDARY:
-$(DIR)/%.s: $(DIR)/%.c $(CCOMP)
+$(DIR)/$(ASMDIR)/%.s: $(DIR)/%.c $(CCOMP)
+	@mkdir -p $(@D)
 	ccomp $(DEBUG) -O0 -v -S $< -o $@
 
-$(DIR)/%.tok: $(DIR)/%.bin
+$(DIR)/$(BINDIR)/%.tok: $(DIR)/$(BINDIR)/%.bin
+	@mkdir -p $(@D)
 	@bash check.sh $< $@
 
 .PHONY: FORCE
@@ -39,8 +44,8 @@ clean:
 	rm -f $(DIR)/*.mach
 	rm -f $(DIR)/*.parsed.c
 	rm -f $(DIR)/*.rtl.?
-	rm -f $(DIR)/*.s
-	rm -f $(DIR)/*.tok
+	rm -f $(DIR)/$(ASMDIR)/*.s
+	rm -f $(DIR)/$(BINDIR)/*.[bin,tok]
 	rm -f $(DIR)/output/*.out
 	rm -rf $(DIR)/profile/
 	rm -f $(ELF)
diff --git a/test/mppa/check.sh b/test/mppa/check.sh
index f38d3f0d..dd9691be 100644
--- a/test/mppa/check.sh
+++ b/test/mppa/check.sh
@@ -11,11 +11,12 @@ fi
 
 dir="$(dirname $elffile)"
 elf="$(basename $elffile)"
-exp="$dir/output/$elf.exp"
-out="$dir/output/$elf.out"
+
+exp="$dir/../output/$elf.exp"
+out="$dir/../output/$elf.out"
 if [ ! -f $exp ]; then
 	>&2 echo "ERROR: $exp not found"
-	shift; continue
+	exit
 fi
 
 k1-cluster -- $elffile > $out
@@ -24,7 +25,6 @@ echo $? >> $out
 if ! diff $exp $out; then
 	>&2 echo "ERROR: $exp and $out differ"
 	exit
-	#shift; continue
 fi
 
 echo "PASSED: $elf"
-- 
cgit