use 'testwrk' dir for bdiff

diff --git a/.gitignore b/.gitignore
index 1d5928af76b58a945fcde4f9411eba6d5c044196..196cdc3d787405ad7c1e124a9e7d7287ebca4cf1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@
 /mou/
 /ser/
 /targetutil/
+/testwrk/
 /tgi/
 /wrk/

diff --git a/test/Makefile b/test/Makefile
index f5f10c029220052c7ae599f1ad1f01b2607aa043..be0360c41275eac9bf90986da9030eed4cc52e10 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,21 +8,28 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
-RM := del /f
-EXE := .exe
+  RM := del /f
+  EXE := .exe
+  MKDIR = mkdir
 else
-RM := rm -f
-EXE :=
+  RM := rm -f
+  EXE :=
+  MKDIR = mkdir -p
 endif
 
+WORKDIR := ../testwrk
+
 .PHONY: dotests clean
 
 all: dotests
 
-bdiff:
-       @$(CC) -o bdiff$(EXE) bdiff.c
+$(WORKDIR):
+       @$(MKDIR) $(WORKDIR)
+
+$(WORKDIR)/bdiff$(EXE): $(WORKDIR)
+       @$(CC) -o $(WORKDIR)/bdiff$(EXE) bdiff.c
 
-dotests: bdiff
+dotests: $(WORKDIR)/bdiff$(EXE)
        @$(MAKE) -C val clean all
        @$(MAKE) -C ref clean all
        @$(MAKE) -C err clean all
@@ -33,4 +40,4 @@ clean:
        @$(MAKE) -C ref clean
        @$(MAKE) -C err clean
        @$(MAKE) -C misc clean
-       @$(RM) bdiff$(EXE)
+       @$(RM) $(WORKDIR)/bdiff$(EXE)

diff --git a/test/err/Makefile b/test/err/Makefile
index 3ced60bc89ad35c873c01885da966db7a42209a6..fd18bf7524086f8c1e72d4e9685ba388c5f79b6d 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -15,6 +15,8 @@ else
 RM := rm -f
 endif
 
+WORKDIR := ./../../testwrk
+
 .PHONY: all clean
 
 TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index e3d60269d144076813806e988bcd5c34ff175d61..43cb6f5769db2c79d6842bc5abb7a783678154ed 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -17,7 +17,9 @@ else
 RM := rm -f
 endif
 
-DIFF := ./../bdiff
+WORKDIR := ./../../testwrk
+
+DIFF := $(WORKDIR)/bdiff
 
 .PHONY: all clean
 

diff --git a/test/ref/Makefile b/test/ref/Makefile
index ccb52c3ba8ee55a2f3b399d4a7f492ffab08049b..a8d87c4c315a16cab644f411bf6c10ba2768b04e 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -18,7 +18,9 @@ else
 RM := rm -f
 endif
 
-DIFF := ./../bdiff
+WORKDIR := ./../../testwrk
+
+DIFF := $(WORKDIR)/bdiff
 
 CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
 

diff --git a/test/val/Makefile b/test/val/Makefile
index e4841bd35a02872d3e600d7361dfa345af1ea8a6..6a40feb6173d0b4adefd592ceabad898f77f3fd2 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -17,6 +17,8 @@ else
 RM := rm -f
 endif
 
+WORKDIR := ./../../testwrk
+
 .PHONY: all clean
 
 TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))