From ed13a7f19c7ed658aeb3c14f16c7aba788f9c889 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Wed, 2 Aug 2017 21:28:47 +0900
Subject: [PATCH] Allow building test suite using nmake in a different place
 other than the source code is.

---
 test/win.mak | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/win.mak b/test/win.mak
index faed602..ed70b38 100644
--- 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
-- 
2.39.5