8249700: java/io/File/GetXSpace.java should be added to exclude list,…

… and not @Ignore-d Reviewed-by: alanb
openjdk · Jul 20, 2020 · 8d97637 · 8d97637
1 parent af0d6d2
commit 8d97637
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -586,6 +586,7 @@ javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java 822733
 # jdk_io
 
 java/io/pathNames/GeneralWin32.java                             8180264 windows-all
+java/io/File/GetXSpace.java                                     6501010,8249703 windows-all,macosx-all
 
 ############################################################################
 

diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
@@ -24,7 +24,6 @@
 /**
  * @test
  * @bug 4057701 6286712 6364377
- * @ignore until 6492634 and 6501010 is fixed
  * @run build GetXSpace
  * @run shell GetXSpace.sh
  * @summary Basic functionality of File.get-X-Space methods.
@@ -135,7 +134,7 @@ private static ArrayList space(String f) throws IOException {
         ArrayList al = new ArrayList();
 
         Process p = null;
-        String cmd = "df -k" + (f == null ? "" : " " + f);
+        String cmd = "df -k -P" + (f == null ? "" : " " + f);
         p = Runtime.getRuntime().exec(cmd);
         BufferedReader in = new BufferedReader
             (new InputStreamReader(p.getInputStream()));

diff --git a/test/jdk/java/io/File/GetXSpace.sh b/test/jdk/java/io/File/GetXSpace.sh
@@ -26,7 +26,7 @@
 # set platform-dependent variable
 OS=`uname -s`
 case "$OS" in
-  Linux ) TMP=/tmp  ;;
+  Linux | Darwin ) TMP=/tmp ;;
   Windows_98 )    return    ;;
   Windows* )      SID=`sid`; TMP="c:/temp"  ;;
   * )
@@ -49,11 +49,11 @@ allow() {
   case "$OS" in
   Windows* ) chacl -g ${SID}:f $* ;;
   * )        chmod 777 $*         ;;
-  esac 
+  esac
 }
 
 runTest() {
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} GetXSpace $* 
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} GetXSpace $*
   if [ $? -eq 0 ]
   then echo "Passed"
   else
@@ -64,17 +64,17 @@ runTest() {
 
 # df output
 runTest
- 
+
 # readable file in an unreadable directory
-mkdir ${TMP1}
+mkdir -p ${TMP1}
 touch ${TMP1}/foo
 deny ${TMP1}
 runTest ${TMP1}/foo
 allow ${TMP1}
 rm -rf ${TMP1}
 
 if [ ${FAIL} -ne 0 ]
-then 
+then
   echo ""
   echo "${FAIL} test(s) failed"
   exit 1