Skip to content
Permalink
Browse files

8179317: [TESTBUG] rewrite runtime shell tests in java

Converted shell tests to Java

Reviewed-by: dholmes, iignatyev, lmesnik
  • Loading branch information
Mikhailo Seledtsov
Mikhailo Seledtsov committed Feb 5, 2020
1 parent 0372124 commit ccb4ab5499275888e6a088d8bec2faccd6b4db28
@@ -1,5 +1,5 @@
#
# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2015, 2020, 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
@@ -880,8 +880,10 @@ endif
ifeq ($(call isTargetOs, windows), true)
BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exejvm-test-launcher := jvm.lib

else
BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exejvm-test-launcher := -ljvm
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop001 += -lpthread
@@ -552,7 +552,7 @@ vmTestbase_largepages = \
vmTestbase/metaspace/stressDictionary/StressDictionary.java \
vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java \
vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java \
vmTestbase/metaspace/flags/maxMetaspaceSize/TestDescription.java \
vmTestbase/metaspace/flags/maxMetaspaceSize/TestMaxMetaspaceSize.java \
vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java \
vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java \
vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java

This file was deleted.

@@ -0,0 +1,45 @@
/*
* Copyright (c) 2020, 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
* @bug 7162488
* @summary VM should print unrecognized -XX option
* @library /test/lib
* @run driver TestUnrecognizedVmOption
*/
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;

public class TestUnrecognizedVmOption {
static final String OPTION="this_is_not_an_option";

public static void main(String[] args) throws Exception {
ProcessBuilder pb =
ProcessTools.createJavaProcessBuilder(true, "-showversion", "-XX:" + OPTION);
new OutputAnalyzer(pb.start())
.shouldNotHaveExitValue(0)
.shouldContain("Unrecognized VM option")
.shouldContain(OPTION);
}
}
@@ -0,0 +1,53 @@
/*
* Copyright (c) 2020, 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
* @summary Linux kernel stack guard should not cause segfaults on x86-32
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @requires os.family == "linux"
* @compile T.java
* @run main/native TestStackGap
*/


import jdk.test.lib.Utils;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;

public class TestStackGap {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createNativeTestProcessBuilder("stack-gap");
pb.environment().put("CLASSPATH", Utils.TEST_CLASS_PATH);
new OutputAnalyzer(pb.start())
.shouldHaveExitValue(0);

pb = ProcessTools.createNativeTestProcessBuilder("stack-gap",
"-XX:+DisablePrimordialThreadGuardPages");
pb.environment().put("CLASSPATH", Utils.TEST_CLASS_PATH);
new OutputAnalyzer(pb.start())
.shouldHaveExitValue(0);
}
}

This file was deleted.

@@ -0,0 +1,52 @@
/*
* Copyright (c) 2020, 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
* @summary Stack guard pages should be installed correctly and removed when thread is detached
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @requires os.family == "linux"
* @compile DoOverflow.java
* @run main/native TestStackGuardPages
*/
import jdk.test.lib.Utils;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;


public class TestStackGuardPages {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createNativeTestProcessBuilder("invoke",
"test_java_overflow");
pb.environment().put("CLASSPATH", Utils.TEST_CLASS_PATH);
new OutputAnalyzer(pb.start())
.shouldHaveExitValue(0);

pb = ProcessTools.createNativeTestProcessBuilder("invoke", "test_native_overflow");
pb.environment().put("CLASSPATH", Utils.TEST_CLASS_PATH);
new OutputAnalyzer(pb.start())
.shouldHaveExitValue(0);
}
}

This file was deleted.

0 comments on commit ccb4ab5

Please sign in to comment.