mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

al_xipe
14.00.2007 0cbcf103ba5861aaaf21bf275246850e3adc2508
remove hardcoded win2003 string and use regex to make runfunctest windows agnostic
1 files modified
14 ■■■■ changed files
opends/tests/functional-tests/testcases/runFuncTests.xml 14 ●●●● patch | view | raw | blame | history
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)" />