From 0cbcf103ba5861aaaf21bf275246850e3adc2508 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Wed, 14 Feb 2007 22:00:10 +0000
Subject: [PATCH] remove hardcoded win2003 string and use regex to make runfunctest windows agnostic
---
opends/tests/functional-tests/testcases/runFuncTests.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/runFuncTests.xml b/opends/tests/functional-tests/testcases/runFuncTests.xml
index d235c29..944f4fc 100755
--- a/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -56,20 +56,20 @@
</call>
<script>
+ import re
STAXLogMessage = 1
SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
OSName= STAXResult
+ winPattern=re.compile('win*', re.IGNORECASE)
+ isWindows=winPattern.match(OSName)
+ if isWindows:
+ fileExt='.bat'
+ else:
+ fileExt=''
</script>
- <if expr="OSName == 'Win2003'">
- <script>fileExt= '.bat'</script>
- <else>
- <script>fileExt= ''</script>
- </else>
- </if>
-
<!--- The Functional Tests -->
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/setup/setup.xml' % (TESTS_DIR)" />
--
Gitblit v1.10.0