[Oorexx-svn] SF.net SVN: oorexx:[3636] test/trunk/ooTest.frm

[<mie...@us...>]

Revision: 3636
          http://oorexx.svn.sourceforge.net/oorexx/?rev=3636&view=rev
Author:   miesfeld
Date:     2008-10-30 04:11:34 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
ooTest - On AIX, see if augmenting the LIBPATH allows the external libraries
to be found during test execution.

Modified Paths:
--------------
    test/trunk/ooTest.frm

Modified: test/trunk/ooTest.frm
===================================================================
--- test/trunk/ooTest.frm	2008-10-29 23:32:06 UTC (rev 3635)
+++ test/trunk/ooTest.frm	2008-10-30 04:11:34 UTC (rev 3636)
@@ -142,17 +142,31 @@
 ::routine setExternalLibDir
 
   os = .ooRexxUnit.osName
+  sl = .ooRexxUnit.directory.separator
+  sep = .ooRexxUnit.path.separator
 
-  if os == "WINDOWS" then do
-    libDir = .ooTest.dir || '\bin\'os
-    j = addToPath(libDir)
-  end
-  else do
-    curLDPath = getEnvValue("LD_LIBRARY_PATH")
-    libDir = .ooTest.dir || '/bin/'os || .ooRexxUnit.path.separator || curLDPath
+  libDir = .ooTest.dir || sl || 'bin' || sl || os
 
-    j = replaceEnvValue("LD_LIBRARY_PATH", libDir)
+  select
+    when os == "WINDOWS" then do
+      j = addToPath(libDir)
+    end
+    when os == 'AIX' then do
+      curLibPath = getEnvValue("LIBPATH")
+      libDir = libDir || sep || curLibPath
+      j = replaceEnvValue("LIBPATH", libDir)
+    end
+    when os == 'LINUX' then do
+      curLDPath = getEnvValue("LD_LIBRARY_PATH")
+      libDir = libDir || sep || curLDPath
+      j = replaceEnvValue("LD_LIBRARY_PATH", libDir)
+    end
+    otherwise do
+      say 'ooTest.frm::routine::setExternalDir() line:' .line
+      say '  Need code for operating system:' os
+    end
   end
+  -- End select
 
 return 0
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.