/hg/icedtea6: Testcase correction - the regression test LastErro...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Feb 23 00:43:24 PST 2011
changeset 0cd82f25d67d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0cd82f25d67d
author: ptisnovs
date: Wed Feb 23 08:50:30 2011 +0100
Testcase correction - the regression test LastErrorString must not
rewrite system files
diffstat:
3 files changed, 210 insertions(+), 1 deletion(-)
ChangeLog | 7 +
Makefile.am | 3
patches/jtreg-LastErrorString.patch | 201 +++++++++++++++++++++++++++++++++++
diffs (232 lines):
diff -r e1a5ab4cf428 -r 0cd82f25d67d ChangeLog
--- a/ChangeLog Tue Feb 22 23:07:58 2011 +0000
+++ b/ChangeLog Wed Feb 23 08:50:30 2011 +0100
@@ -1,3 +1,10 @@ 2011-02-22 Andrew John Hughes <ahughes
+2011-02-23 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add patch.
+ * patches/jtreg-LastErrorString.patch:
+ Testcase correction - the test LastErrorString must not rewrite system
+ files.
+
2011-02-22 Andrew John Hughes <ahughes at redhat.com>
* patches/sunsrc.patch: Removed.
diff -r e1a5ab4cf428 -r 0cd82f25d67d Makefile.am
--- a/Makefile.am Tue Feb 22 23:07:58 2011 +0000
+++ b/Makefile.am Wed Feb 23 08:50:30 2011 +0100
@@ -325,7 +325,8 @@ ICEDTEA_PATCHES = \
patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
patches/openjdk/6896068-sg2d.patch \
patches/pr633-no_javaws_man_page.patch \
- patches/pr586-include_all_srcs.patch
+ patches/pr586-include_all_srcs.patch \
+ patches/jtreg-LastErrorString.patch
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r e1a5ab4cf428 -r 0cd82f25d67d patches/jtreg-LastErrorString.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-LastErrorString.patch Wed Feb 23 08:50:30 2011 +0100
@@ -0,0 +1,201 @@
+diff -Nru IOException/LastErrorString.java /home/brq/ptisnovs/IOException/LastErrorString.java
+--- openjdk-old/jdk/test/java/io/IOException/LastErrorString.java 2011-01-21 00:54:47.000000000 +0100
++++ openjdk/jdk/test/java/io/IOException/LastErrorString.java 2011-02-21 15:34:58.972481000 +0100
+@@ -21,9 +21,13 @@
+ * questions.
+ */
+
+-/* @test
+- @bug 4167937
+- @summary Test code paths that use the JVM_LastErrorString procedure
++/*
++ * @test
++ * @bug 4167937
++ * @summary Test code paths that use the JVM_LastErrorString procedure
++ *
++ * @compile LastErrorString.java
++ * @run shell LastErrorString.sh
+ */
+
+ import java.io.IOException;
+@@ -37,33 +41,11 @@
+
+ static String UNWRITEABLE_DIR;
+ static String UNREADABLE_FILE;
++ static String UNWRITEABLE_FILE;
+ static String READABLE_FILE;
+ static String WRITEABLE_FILE;
+ static String INVALID_PATH;
+
+- static {
+- if (File.separatorChar == '/') {
+- UNWRITEABLE_DIR = "/etc/dfs";
+- UNREADABLE_FILE = "/etc/shadow";
+- } else if (File.separatorChar == '\\') {
+- UNREADABLE_FILE = "c:/pagefile.sys";
+- UNWRITEABLE_DIR = "z:/fooBAR/baz/GORP";
+- } else {
+- throw new RuntimeException("What kind of system is this?");
+- }
+- File d = new File(System.getProperty("test.src", "."));
+- READABLE_FILE = new File(d, "LastErrorString.java").getPath();
+- WRITEABLE_FILE = "x.LastErrorString";
+- String s = "foo/";
+- for (;;) {
+- s = s + s;
+- if (s.length() > 8192) break;
+- }
+- s += "bar";
+- INVALID_PATH = s;
+- }
+-
+-
+ static abstract class Test {
+
+ String name;
+@@ -197,7 +179,7 @@
+
+ new Test("FileOutputStream") {
+ public void run() throws IOException {
+- new FileOutputStream(UNREADABLE_FILE);
++ new FileOutputStream(UNWRITEABLE_FILE);
+ }}.go();
+
+ new ClosedFOSTest("write()") {
+@@ -257,8 +239,29 @@
+
+ }
+
++ public static void preparePaths(String workDir) {
++ System.out.println("Work directory: " + workDir);
++
++ // directory prepared by shell script
++ UNWRITEABLE_DIR = workDir + "unwriteable_dir";
++
++ // files prepared by shell script
++ READABLE_FILE = workDir + "readable_file";
++ WRITEABLE_FILE = workDir + "writeable_file";
++ UNREADABLE_FILE = workDir + "unreadable_file";
++ UNWRITEABLE_FILE = workDir + "unwriteable_file";
++
++ String s = "foo/";
++ for (;;) {
++ s = s + s;
++ if (s.length() > 8192) break;
++ }
++ s += "bar";
++ INVALID_PATH = s;
++ }
+
+ public static void main(String[] args) throws Exception {
++ preparePaths(args[0]);
+ go();
+ }
+
+diff -Nru IOException/LastErrorString.sh /home/brq/ptisnovs/IOException/LastErrorString.sh
+--- /dev/null 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/test/java/io/IOException/LastErrorString.sh 2011-02-21 15:34:58.972481000 +0100
+@@ -0,0 +1,103 @@
++#!/bin/sh
++
++# Copyright (c) 2011, Red Hat Inc.
++#
++# This code is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This code is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++
++# @test
++# @bug 4167937
++# @summary Test code paths that use the JVM_LastErrorString procedure
++#
++# @compile LastErrorString.java
++# @run shell LastErrorString.sh
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=.
++fi
++
++# if TESTJAVA isn't set then we assume an interactive run. So that it's
++# clear which version of 'java' is running we do a 'which java' and
++# a 'java -version'.
++if [ "${TESTJAVA}" = "" ]
++then
++ PARENT=`dirname \`which java\``
++ TESTJAVA=`dirname ${PARENT}`
++ echo "TESTJAVA not set, selecting ${TESTJAVA}"
++ echo "If this is incorrect, try selecting the variable manually."
++fi
++
++echo "TESTJAVA is set to ${TESTJAVA}"
++
++if [ "${TESTCLASSES}" = "" ]
++then
++ echo "TESTCLASSES not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++echo "TESTCLASSES is set to ${TESTCLASSES}"
++
++CLASSPATH=${TESTCLASSES}
++export CLASSPATH
++
++WORK_DIR=`pwd`
++echo "WORK_DIR is set to ${WORK_DIR}"
++
++# set platform-dependent variables and create work files
++OS=`uname -s`
++case "$OS" in
++ Linux | SunOS )
++ echo "UNIX-like system found - that's great!"
++ FS="/"
++ ;;
++ Windows_* )
++ echo "Windows system found, can live with that."
++ FS="\\"
++ ;;
++ * )
++ echo "Unrecognized system $OS!"
++ exit 1
++ ;;
++esac
++
++# erase files created by previous test run
++rm -f readable_file
++rm -f writeable_file
++rm -f unreadable_file
++rm -f unwriteable_file
++
++# create directory + files
++mkdir unwriteable_dir
++touch readable_file
++touch writeable_file
++touch unreadable_file
++touch unwriteable_file
++
++# set proper ACL
++chmod u+r readable_file
++chmod u+w writeable_file
++chmod a-r unreadable_file
++chmod a-w unwriteable_file
++chmod a-w unwriteable_dir
++
++echo "Work directory content:"
++ls -l .
++
++# first parameter to test: work directory + separator
++${TESTJAVA}${FS}bin${FS}java LastErrorString ${WORK_DIR}${FS}
++STATUS=$?
++
++exit $STATUS
++
More information about the distro-pkg-dev
mailing list