aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorklaar36 <klas.arvidsson@liu.se>2015-05-12 21:05:44 +0200
committerklaar36 <klas.arvidsson@liu.se>2015-05-12 21:05:44 +0200
commitcec7340edd92fe9025db3df1140c69dd039263a6 (patch)
tree4a5a173d8b4587ee1f7f1fff6700019d1885d0aa /src
parentadfc9d44534a3c02795c949aac29305dd410d4b0 (diff)
downloadpintos-rs-cec7340edd92fe9025db3df1140c69dd039263a6.tar.gz
Makefile correction to run gmake check on Solaris
Diffstat (limited to 'src')
-rw-r--r--src/tests/Make.tests6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tests/Make.tests b/src/tests/Make.tests
index 6880fdf..bcaa2d1 100644
--- a/src/tests/Make.tests
+++ b/src/tests/Make.tests
@@ -69,7 +69,13 @@ $(foreach test,$(TESTS),$(eval $(test).output: TEST = $(test)))
# Prevent an environment variable VERBOSE from surprising us.
VERBOSE =
+# klaar@ida 2015-05-12: to run gmake check in Solaris
+ifneq (0, $(shell expr `uname -s` : 'Linux'))
TESTCMD = pintos -v -k -T $(TIMEOUT)
+else
+TESTCMD = spintos -v -k -T $(TIMEOUT)
+endif
+
TESTCMD += $(SIMULATOR)
TESTCMD += $(PINTOSOPTS)
ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)