Skip to content

Commit

Permalink
8319574: Exec/process tests should be marked as flagless
Browse files Browse the repository at this point in the history
Reviewed-by: bpb, naoto, jpai
  • Loading branch information
Roger Riggs committed Nov 9, 2023
1 parent 7b971c1 commit 68110b7
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 9 deletions.
3 changes: 2 additions & 1 deletion test/jdk/java/lang/ProcessBuilder/Basic.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, 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
Expand Down Expand Up @@ -34,6 +34,7 @@
* java.base/java.io:open
* java.base/jdk.internal.misc
* @requires !vm.musl
* @requires vm.flagless
* @library /test/lib
* @run main/othervm/native/timeout=300 -Djava.security.manager=allow Basic
* @run main/othervm/native/timeout=300 -Djava.security.manager=allow -Djdk.lang.Process.launchMechanism=fork Basic
Expand Down
1 change: 1 addition & 0 deletions test/jdk/java/lang/ProcessBuilder/InheritIOTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* @test
* @bug 8023130 8166026
* @summary Unit test for java.lang.ProcessBuilder inheritance of standard output and standard error streams
* @requires vm.flagless
* @library /test/lib
* @build jdk.test.lib.process.*
* @run testng InheritIOTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* @bug 8307990
* @requires (os.family == "linux") | (os.family == "aix")
* @requires vm.debug
* @requires vm.flagless
* @library /test/lib
* @run main/othervm/timeout=300 JspawnhelperProtocol
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/*
* @test
* @summary verify logging of ProcessBuilder.start()
* @requires vm.flagless
* @run junit/othervm ProcessStartLoggingTest
*/
public class ProcessStartLoggingTest {
Expand Down
1 change: 1 addition & 0 deletions test/jdk/java/lang/ProcessBuilder/ReaderWriterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

/*
* @test
* @requires vm.flagless
* @library /test/lib
* @build jdk.test.lib.process.ProcessTools jdk.test.lib.hexdump.HexPrinter
* @run testng ReaderWriterTest
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/java/lang/ProcessBuilder/SkipTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, 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
Expand All @@ -24,6 +24,7 @@
/*
* @test
* @bug 8155808
* @requires vm.flagless
* @run main SkipTest
* @summary verify skip method of Process Input Stream
*/
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/java/lang/ProcessHandle/OnExitTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2023, 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
Expand Down Expand Up @@ -40,6 +40,7 @@

/*
* @test
* @requires vm.flagless
* @library /test/lib
* @modules jdk.management
* @build jdk.test.lib.Utils
Expand Down
1 change: 1 addition & 0 deletions test/jdk/java/lang/ProcessHandle/TreeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

/*
* @test
* @requires vm.flagless
* @library /test/lib
* @modules java.base/jdk.internal.misc
* jdk.management
Expand Down
1 change: 1 addition & 0 deletions test/jdk/java/lang/RuntimeTests/RuntimeExitLogTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
/*
* @test
* @summary verify logging of call to System.exit or Runtime.exit.
* @requires vm.flagless
* @run junit/othervm RuntimeExitLogTest
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, 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
Expand All @@ -25,6 +25,7 @@
* @bug 4794652
* @summary Ensure that a command argument that contains a space and a final
* backslash is handled correctly
* @requires vm.flagless
*/

import java.io.*;
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/java/lang/RuntimeTests/exec/Duped.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2023, 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
Expand All @@ -24,6 +24,7 @@
/* @test
@bug 4180429
@summary Lossage in dup2 if System.in is closed.
@requires vm.flagless
@run main/othervm Duped
*/

Expand Down
3 changes: 2 additions & 1 deletion test/jdk/java/lang/RuntimeTests/exec/ExecWithLotsOfArgs.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023, 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
Expand All @@ -25,6 +25,7 @@
@bug 4033560
@summary 4033560 limited args of exec to 198 on Solaris. We check
that we can actually exec more args than that.
@requires vm.flagless
@author Anand Palaniswamy
@run main/othervm ExecWithLotsOfArgs
*/
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/java/lang/RuntimeTests/exec/ExitValue.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2023, 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
Expand All @@ -25,6 +25,7 @@
* @test
* @bug 4680945 4873419
* @summary Check process exit code
* @requires vm.flagless
* @author kladko, Martin Buchholz
*/

Expand Down
4 changes: 2 additions & 2 deletions test/jdk/java/lang/RuntimeTests/exec/SetCwd.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2023, 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
Expand Down Expand Up @@ -27,7 +27,7 @@
* @summary Basic functional test for
* Runtime.exec(String[] command, String[] env, File path) and
* Runtime.exec(String command, String[] env, File path).
*
* @requires vm.flagless
* @library /test/lib
* @run testng/othervm SetCwd
*/
Expand Down

3 comments on commit 68110b7

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 68110b7 Mar 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 68110b7 Mar 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch backport-GoeLin-68110b7a in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 68110b7a from the openjdk/jdk repository.

The commit being backported was authored by Roger Riggs on 9 Nov 2023 and was reviewed by Brian Burkhalter, Naoto Sato and Jaikiran Pai.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-68110b7a:backport-GoeLin-68110b7a
$ git checkout backport-GoeLin-68110b7a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-68110b7a

Please sign in to comment.