summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-20 17:51:32 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-20 17:51:32 +0000
commitd3195470bae88cabac134e2840fcfb7d8d790cd5 (patch)
tree3677a11012f5ec5e5d2debff90aaa5417704c224
parentff27a85a2b7663bc50c7e9f28d1d97c63d4a757f (diff)
tests: Final MacOS fixes
git-svn-id: http://pugixml.googlecode.com/svn/trunk@435 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--Jamrules.jam2
-rw-r--r--tests/autotest-macos.sh12
-rw-r--r--tests/autotest-report.pl2
3 files changed, 15 insertions, 1 deletions
diff --git a/Jamrules.jam b/Jamrules.jam
index 7cd9abc..5837dda 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -27,7 +27,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
CCFLAGS += -fno-exceptions ;
}
- if ( $(toolset:I=^mingw) )
+ if ( $(OS) != MACOSX )
{
LDFLAGS += -static-libgcc -static ;
}
diff --git a/tests/autotest-macos.sh b/tests/autotest-macos.sh
new file mode 100644
index 0000000..fc21fc8
--- /dev/null
+++ b/tests/autotest-macos.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# put this to /Library/StartupItems/pugixml-autotest/pugixml-autotest, then create
+# file StartupParameters.plist in the same folder with the following contents:
+# <plist><dict><key>Provides</key><array><string>pugixml-autotest</string></array></dict></plist>
+# don't forget to chmod +x pugixml-autotest and to replace /Users/USERNAME with actual path
+
+if [ "$1" = "start" ]
+then
+ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+ cd /Users/USERNAME/pugixml
+ perl tests/autotest-remote-host.pl "shutdown -h now" &
+fi
diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl
index d789191..5a86478 100644
--- a/tests/autotest-report.pl
+++ b/tests/autotest-report.pl
@@ -23,6 +23,8 @@ sub prettyplatform
{
my $platform = shift;
+ return "macos32" if ($platform =~ /darwin/);
+
return "linux64" if ($platform =~ /64-linux/);
return "linux32" if ($platform =~ /86-linux/);