Skip to content

Commit 1883499

Browse files
authored
Merge pull request #2172 from gforney/master
checker: add test for platform when running checker script
2 parents 7b6ca7b + e91a662 commit 1883499

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Diff for: Build/smokeview/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ gnu_linux_64_check : $(src)
393393

394394
# ------------- linux_osx_check ----------------
395395

396-
linux_osx_check : CFLAGS =
396+
linux_osx_check : CFLAGS = $(SMV_TESTFLAG)
397397
linux_osx_check : $(linux_osx_chk)
398398
$(CLANGSUMMARY) smokeview.summary
399399

Diff for: Build/smokeview/check/check_smokeview.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
#!/bin/bash
22

3-
eval make -j 8 -f ../Makefile linux_osx_check
3+
if [ "`uname`" == "Darwin" ] ; then
4+
platform="osx"
5+
PLATFORM="SMV_TESTFLAG=\"-D pp_OSX\""
6+
else
7+
platform="linux"
8+
PLATFORM="SMV_TESTFLAG=\"-D pp_LINUX\""
9+
fi
10+
11+
eval make -j 8 $PLATFORM -f ../Makefile linux_osx_check

0 commit comments

Comments
 (0)