Fix symlink and line endings for Windows.

jedie · Mar 21, 2016 · f8c2681 · f8c2681
1 parent 640dcb9
commit f8c2681
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build-java.xml b/build-java.xml
@@ -47,9 +47,9 @@
 
     <jar jarfile="${dist}/Python-Java-testdaemon-${python-version}-b${release}.jar" basedir="${build}/java-testdaemon"/>
 
-    <symlink
-        link="${dist}/python-java-testdaemon.jar"
-        resource="${dist}/Python-Java-testdaemon-${python-version}-b${release}.jar"
+    <copy
+        tofile="${dist}/python-java-testdaemon.jar"
+        file="${dist}/Python-Java-testdaemon-${python-version}-b${release}.jar"
         overwrite="true" />
   </target>
 

diff --git a/tests/utils.py b/tests/utils.py
@@ -156,7 +156,7 @@ def runAsJava(test_dir, main_code, extra_code=None, run_in_function=False, args=
         while True:
             try:
                 line = _jvm.stdout.readline().decode("utf-8")
-                if line == ".\n":
+                if line == ".{0}".format(os.linesep):
                     break
                 else:
                     out += line