From c9b59d8ffd825b492613f8ef6198b4ea8b84b860 Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 31 Aug 2006 19:06:14 +0000
Subject: [PATCH] * sim/ucsim/cmd.src/newcmd.cc: #include <ctype.h> *
 support/regression/ports/ds390/spec.mk,
 support/regression/ports/mcs51/spec.mk,  
 support/regression/ports/xa51/spec.mk: introduced DEV_NULL variable.   To run
 regression tests in mingw environment type:   make DEV_NULL=NUL CC=gcc

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4352 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                              | 7 +++++++
 sim/ucsim/cmd.src/newcmd.cc            | 1 +
 support/regression/ports/ds390/spec.mk | 6 +++++-
 support/regression/ports/mcs51/spec.mk | 6 +++++-
 support/regression/ports/xa51/spec.mk  | 6 +++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c03c548a..01e5afc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2006-08-31 Borut Razem <borut.razem AT siol.net>
 
 	* sim/ucsim/cmd.src/newcmdposix.cc: #include <assert.h>
+	* sim/ucsim/cmd.src/newcmd.cc: #include <ctype.h>
+	* sim/ucsim/cmd.src/newcmd.cc: #include <ctype.h>
+	* support/regression/ports/ds390/spec.mk,
+	  support/regression/ports/mcs51/spec.mk,
+	  support/regression/ports/xa51/spec.mk: introduced DEV_NULL variable.
+	  To run regression tests in mingw environment:
+	  make DEV_NULL=NUL CC=gcc
 
 2006-08-30 Borut Razem <borut.razem AT siol.net>
 
diff --git a/sim/ucsim/cmd.src/newcmd.cc b/sim/ucsim/cmd.src/newcmd.cc
index a603324d..f5e5c9a0 100644
--- a/sim/ucsim/cmd.src/newcmd.cc
+++ b/sim/ucsim/cmd.src/newcmd.cc
@@ -32,6 +32,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include "i_string.h"
 
 #include "cmdlexcl.h"
diff --git a/support/regression/ports/ds390/spec.mk b/support/regression/ports/ds390/spec.mk
index 834d5507..6f0a5bab 100644
--- a/support/regression/ports/ds390/spec.mk
+++ b/support/regression/ports/ds390/spec.mk
@@ -1,5 +1,9 @@
 # Port specification for the ds390 port running with uCsim
 
+ifndef DEV_NULL
+  DEV_NULL = /dev/null
+endif
+
 # path to uCsim
 S51A = $(top_builddir)sim/ucsim/s51.src/s51
 S51B = $(top_builddir)bin/s51
@@ -32,7 +36,7 @@ $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
 # run simulator with 25 seconds timeout
 %.out: %$(EXEEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 25 $(S51) -tds390f -S in=/dev/null,out=$@ $< < $(PORTS_DIR)/ds390/uCsim.cmd > $(@:.out=.sim) || \
+	-$(CASES_DIR)/timeout 25 $(S51) -tds390f -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/ds390/uCsim.cmd > $(@:.out=.sim) || \
           echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(EXEEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $(@:.out=.sim) >> $@
 	-grep -n FAIL $@ /dev/null || true
diff --git a/support/regression/ports/mcs51/spec.mk b/support/regression/ports/mcs51/spec.mk
index 86ec82a2..fd2a3956 100644
--- a/support/regression/ports/mcs51/spec.mk
+++ b/support/regression/ports/mcs51/spec.mk
@@ -2,6 +2,10 @@
 #
 # model small
 
+ifndef DEV_NULL
+  DEV_NULL = /dev/null
+endif
+
 # path to uCsim
 S51A = $(top_builddir)sim/ucsim/s51.src/s51
 S51B = $(top_builddir)bin/s51
@@ -38,7 +42,7 @@ $(PORT_CASES_DIR)/fwk.lib:
 # run simulator with 30 seconds timeout
 %.out: %$(EXEEXT) gen/timeout
 	mkdir -p $(dir $@)
-	-gen/timeout 30 $(S51) -t32 -S in=/dev/null,out=$@ $< < $(PORTS_DIR)/mcs51/uCsim.cmd > $(@:.out=.sim) \
+	-gen/timeout 30 "$(S51)" -t32 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/mcs51/uCsim.cmd > $(@:.out=.sim) \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(EXEEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $(@:.out=.sim) >> $@
 	-grep -n FAIL $@ /dev/null || true
diff --git a/support/regression/ports/xa51/spec.mk b/support/regression/ports/xa51/spec.mk
index eb50f019..1fb8a4d3 100755
--- a/support/regression/ports/xa51/spec.mk
+++ b/support/regression/ports/xa51/spec.mk
@@ -1,5 +1,9 @@
 # Port specification for the xa51 port running with uCsim
 
+ifndef DEV_NULL
+  DEV_NULL = /dev/null
+endif
+
 # path to uCsim
 SXA_A = $(top_builddir)sim/ucsim/xa.src/sxa
 SXA_B = $(top_builddir)bin/sxa
@@ -29,7 +33,7 @@ $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
 # run simulator with 1 second timeout
 %.out: %$(EXEEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 1 $(SXA) -S in=/dev/null,out=$@ $< < $(PORTS_DIR)/xa51/uCsim.cmd >/dev/null || \
+	-$(CASES_DIR)/timeout 1 $(SXA) -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/xa51/uCsim.cmd >/dev/null || \
           echo -e --- FAIL: \"timeout, simulation killed\" in $(<:.ihx=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-- 
2.30.2