Allow building test suite using nmake in a different place other than the source...

diff --git a/test/win.mak b/test/win.mak
index faed6024bbcf7dec471634ae942de4962b495947..ed70b38146822e9a657f0b6e33062fa8301f1f91 100644 (file)
--- a/test/win.mak
+++ b/test/win.mak
@@ -9,11 +9,11 @@
 # Comments:             Created by Michael Paquier, 2014-05-21
 #
 
-
+ORIGDIR=.
 # Include the list of tests
 !INCLUDE tests
 
-SRCDIR=src
+SRCDIR=$(ORIGDIR)\src
 OBJDIR=exe
 EXEDIR=exe
 
@@ -59,11 +59,11 @@ $(OBJDIR) :
 !ENDIF
 
 
-runsuite.exe: runsuite.c
-   cl runsuite.c $(CLFLAGS) $(LINKFLAGS)
+runsuite.exe: $(ORIGDIR)\runsuite.c
+   $(CC) $** $(CLFLAGS) $(LINKFLAGS)
 
-reset-db.exe: reset-db.c $(COMOBJ)
-   cl reset-db.c $(CLFLAGS) $(LINKFLAGS) $(COMOBJ)
+reset-db.exe: $(ORIGDIR)\reset-db.c $(COMOBJ)
+   $(CC) $** $(CLFLAGS) $(LINKFLAGS)
 
 # activate the above inference rule
 .SUFFIXES: .out
@@ -72,11 +72,11 @@ reset-db.exe: reset-db.c $(COMOBJ)
 RESDIR=results
 installcheck: runsuite.exe $(TESTEXES) reset-db.exe
    del regression.diffs
-   .\reset-db < sampletables.sql
+   .\reset-db < $(ORIGDIR)\sampletables.sql
 !IF !EXIST($(RESDIR))
    mkdir $(RESDIR)
 !ENDIF
-   .\runsuite $(TESTS)
+        .\runsuite $(TESTS) --inputdir=$(ORIGDIR)
 
 clean:
    -del $(EXEDIR)\*.exe