8081770: [TESTBUG] regression Test7107135 needs to remove dependence on locally installed gcc
Reviewed-by: cjplummer, dcubed
This commit is contained in:
parent
56ea8e7efa
commit
b571e747c5
hotspot
make/test
test/runtime
@ -62,12 +62,22 @@ BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/ThreadSignalMask
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/execstack
|
||||
endif
|
||||
|
||||
ifeq ($(TOOLCHAIN_TYPE), solstudio)
|
||||
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_liboverflow := -lc
|
||||
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libSimpleClassFileLoadHook := -lc
|
||||
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libGetNamedModuleTest := -lc
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
|
||||
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
|
||||
endif
|
||||
|
||||
BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/hotspot/jtreg/native
|
||||
|
||||
BUILD_HOTSPOT_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/hotspot/jtreg
|
||||
|
@ -1,100 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011 SAP SE. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# 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
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
##
|
||||
## @test Test7107135.sh
|
||||
## @bug 7107135
|
||||
## @bug 8021296
|
||||
## @bug 8025519
|
||||
## @summary Stack guard pages lost after loading library with executable stack.
|
||||
## @run shell Test7107135.sh
|
||||
##
|
||||
|
||||
if [ "${TESTSRC}" = "" ]
|
||||
then
|
||||
TESTSRC=${PWD}
|
||||
echo "TESTSRC not set. Using "${TESTSRC}" as default"
|
||||
fi
|
||||
echo "TESTSRC=${TESTSRC}"
|
||||
## Adding common setup Variables for running shell tests.
|
||||
. ${TESTSRC}/../../test_env.sh
|
||||
|
||||
# set platform-dependent variables
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Linux)
|
||||
echo "Testing on Linux"
|
||||
gcc_cmd=`which gcc`
|
||||
if [ "x$gcc_cmd" == "x" ]; then
|
||||
echo "WARNING: gcc not found. Cannot execute test." 2>&1
|
||||
exit 0;
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Test passed; only valid for Linux"
|
||||
exit 0;
|
||||
;;
|
||||
esac
|
||||
|
||||
ARCH=`uname -m`
|
||||
|
||||
THIS_DIR=.
|
||||
|
||||
cp ${TESTSRC}${FS}*.java ${THIS_DIR}
|
||||
${COMPILEJAVA}${FS}bin${FS}javac *.java
|
||||
|
||||
$gcc_cmd -fPIC -shared -c -o test.o \
|
||||
-I${COMPILEJAVA}${FS}include -I${COMPILEJAVA}${FS}include${FS}linux \
|
||||
${TESTSRC}${FS}test.c
|
||||
|
||||
ld -shared -z execstack -o libtest-rwx.so test.o
|
||||
ld -shared -z noexecstack -o libtest-rw.so test.o
|
||||
|
||||
|
||||
LD_LIBRARY_PATH=${THIS_DIR}
|
||||
echo LD_LIBRARY_PATH = ${LD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
# This should not fail.
|
||||
echo Check testprogram. Expected to pass:
|
||||
echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
|
||||
${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
|
||||
|
||||
echo
|
||||
echo Test changing of stack protection:
|
||||
echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
|
||||
${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
|
||||
JAVA_RETVAL=$?
|
||||
|
||||
if [ "$JAVA_RETVAL" == "0" ]
|
||||
then
|
||||
echo
|
||||
echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
|
||||
${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
|
||||
JAVA_RETVAL=$?
|
||||
fi
|
||||
|
||||
exit $JAVA_RETVAL
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2002-2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP AG. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -42,7 +42,7 @@ class Test {
|
||||
static int Runner() {
|
||||
counter = counter * -1;
|
||||
int i = counter;
|
||||
if(counter < 2) counter += Runner();
|
||||
if (counter < 2) counter += Runner();
|
||||
return i;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2002-2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP AG. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -37,7 +37,7 @@ class TestMT {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static int counter = 1;
|
||||
public static int counter = 1;
|
||||
static int Runner() {
|
||||
counter = counter * -1;
|
||||
int i = counter;
|
74
hotspot/test/runtime/execstack/Testexecstack.java
Normal file
74
hotspot/test/runtime/execstack/Testexecstack.java
Normal file
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* 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
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test Testexecstack.java
|
||||
* @bug 7107135
|
||||
* @bug 8021296
|
||||
* @bug 8025519
|
||||
* @summary Stack guard pages lost after loading library with executable stack.
|
||||
* @requires (os.family == "linux")
|
||||
* @library /testlibrary
|
||||
* @build jdk.test.lib.*
|
||||
* @compile Test.java
|
||||
* @compile TestMT.java
|
||||
* @run driver Testexecstack
|
||||
*/
|
||||
|
||||
import jdk.test.lib.*;
|
||||
|
||||
public class Testexecstack {
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
|
||||
// Get the library path property
|
||||
String libpath = System.getProperty("java.library.path");
|
||||
|
||||
// Create a new java process for the Test Java/JNI test without
|
||||
// an executeable stack
|
||||
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
|
||||
"-Djava.library.path=" + libpath + ":.", "Test", "test-rw");
|
||||
|
||||
// Start the process and check the output
|
||||
OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
||||
output.shouldHaveExitValue(0);
|
||||
|
||||
// Create a new java process for the Test Java/JNI test with an
|
||||
// executable stack
|
||||
pb = ProcessTools.createJavaProcessBuilder(
|
||||
"-Djava.library.path=" + libpath + ":.", "Test", "test-rwx");
|
||||
|
||||
// Start the process and check the output
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldHaveExitValue(0);
|
||||
|
||||
// Create a new java process for the TestMT Java/JNI test with an
|
||||
// executable stack
|
||||
pb = ProcessTools.createJavaProcessBuilder(
|
||||
"-Djava.library.path=" + libpath + ":.", "TestMT", "test-rwx");
|
||||
|
||||
// Start the process and check the output
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldHaveExitValue(0);
|
||||
}
|
||||
}
|
45
hotspot/test/runtime/execstack/libtest-rw.c
Normal file
45
hotspot/test/runtime/execstack/libtest-rw.c
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* Copyright (c) 2002-2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP AG. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* 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
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* This source file is the same as libtest-rwx.c and needs to be a separate
|
||||
* file so it can be built with "-z noexecstack" by the build process.
|
||||
* If any changes are made they probably also need to be made to libtest-rwx.c.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "jni.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
JNIEXPORT jint JNICALL Java_Test_someMethod(JNIEnv *env, jobject mainObject) {
|
||||
return 3;
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2002-2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011 SAP AG. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -22,6 +22,12 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* This source file is the same as libtest-rw.c and needs to be a separate
|
||||
* file so it can be built with "-z execstack" by the build process.
|
||||
* If any changes are made they probably also need to be made to libtest-rwx.c.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
Loading…
x
Reference in New Issue
Block a user