Portability fixes for various tests.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py
index 1b5421c..2bb3be6 100644
--- a/src/engine/SCons/Tool/JavaCommonTests.py
+++ b/src/engine/SCons/Tool/JavaCommonTests.py
@@ -23,6 +23,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os.path
 import sys
 import unittest
 
@@ -46,7 +47,7 @@ public class Foo
 
 }
 """)
-        assert pkg_dir == 'com/sub/bar', pkg_dir
+        assert pkg_dir == os.path.join('com', 'sub', 'bar'), pkg_dir
         assert classes == ['Foo'], classes
 
     def test_inner_classes(self):
@@ -164,7 +165,7 @@ public class Example1 extends UnicastRemoteObject implements Hello {
 }
 """)
 
-        assert pkg_dir == 'com/sub/foo', pkg_dir
+        assert pkg_dir == os.path.join('com', 'sub', 'foo'), pkg_dir
         assert classes == ['Example1'], classes
 
 if __name__ == "__main__":
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
index 45fa4af..ccb62f2 100644
--- a/src/engine/SCons/Tool/javah.py
+++ b/src/engine/SCons/Tool/javah.py
@@ -56,7 +56,7 @@ def emit_java_headers(target, source, env):
             try:
                 classdir = s.attributes.java_classdir
             except:
-                pass
+                classdir = '.'
     classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
     if str(classdir) == '.':
         c_ = None