From a2cf2b579b143b8caf80e6811121f7a80aa25fec Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 16 Jun 2011 11:23:12 +0000
Subject: [PATCH] Update Staf tests to support Mac OS X
---
opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
index 81a5808..ed6d63d 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
@@ -23,6 +23,7 @@
!
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<project name="opends-staf-tests" basedir="../.." default="usage">
@@ -60,7 +61,7 @@
<!-- Define antfile.dir variable -->
<property name="antfile.dir" value="${basedir}/shared/ant"/>
- <!-- Define antfile.dir variable -->
+ <!-- Define tmp.dir variable -->
<property name="tmp.dir" value="${java.io.tmpdir}/temp_files"/>
<!-- Load ant-contrib -->
@@ -125,6 +126,22 @@
<property name="extension.shell" value=""/>
<property name="var.path" value="PATH"/>
</case>
+ <case value="Mac OS X">
+ <!-- MacOSX system -->
+ <switch value="${os.arch}">
+ <case value="x86_64">
+ <!-- Linux i386 -->
+ <property name="os.myname" value="macosx-i386"/>
+ </case>
+ </switch>
+
+ <exec executable="uname" outputproperty="host.name">
+ <arg line="-n"/>
+ </exec>
+ <property name="extension.binary" value=""/>
+ <property name="extension.shell" value=""/>
+ <property name="var.path" value="PATH"/>
+ </case>
<default>
<osfamily property="os.family"/>
<if>
@@ -139,7 +156,7 @@
<property name="var.path" value="Path"/>
</then>
<else>
- <fail>"Unsupported platform."</fail>
+ <fail>"Unsupported platform. ${os.name} - ${os.arch}"</fail>
</else>
</if>
</default>
--
Gitblit v1.10.0