Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
7903373: Add ability to customize test execution using main wrapper p…
…lugin Reviewed-by: jjg
- Loading branch information
1 parent
2f5f269
commit 5b9e661
Showing
17 changed files
with
414 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
src/share/classes/com/sun/javatest/regtest/agent/TestThreadFactoryHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Copyright (c) 2022, 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 | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| package com.sun.javatest.regtest.agent; | ||
|
|
||
| import java.io.IOException; | ||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.net.MalformedURLException; | ||
| import java.net.URL; | ||
| import java.net.URLClassLoader; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.ThreadFactory; | ||
|
|
||
| /** | ||
| * A class which loads thread factory for threads used to run test by jtreg. | ||
| * By default, jtreg creates a new thread for each test using {@code new Thread(ThreadGroup tg, Runnable task);}, | ||
| * but this may be overridden by providing an implementation of {@link java.util.concurrent.ThreadFactory}, | ||
| * which might provide user-defined threads for test execution. | ||
| * Please note, that additional threads started by tests don't use this factory and remain the same. | ||
| * <p> | ||
| * Example: | ||
| * <pre> | ||
| * new Thread(() -> { ....; task.run(); ....; }); | ||
| * or | ||
| * new VirtualThread(task); | ||
| * </pre> | ||
| * Implementation may be specified on the {@code jtreg} command line | ||
| * using {@code -testThreadFactory} and {@code -testThreadFactoryPath} arguments. | ||
| * It is executed by tested JDK in {@code agentvm} and {@code othervm} modes. | ||
| */ | ||
| public final class TestThreadFactoryHelper { | ||
| static ThreadFactory loadThreadFactory(String className, String path) { | ||
|
|
||
| List<URL> urls = new ArrayList<>(); | ||
| if (path != null) { | ||
| SearchPath classpath = new SearchPath(path); | ||
| for (Path f : classpath.asList()) { | ||
| try { | ||
| urls.add(f.toUri().toURL()); | ||
| } catch (MalformedURLException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| try (URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[]{}), ClassLoader.getSystemClassLoader())) { | ||
| Class<? extends ThreadFactory> clz = loader.loadClass(className).asSubclass(ThreadFactory.class); | ||
| Constructor<? extends ThreadFactory> ctor = clz.getDeclaredConstructor(); | ||
| ThreadFactory factory = ctor.newInstance(); | ||
| return factory; | ||
| } catch (ClassNotFoundException | InvocationTargetException | NoSuchMethodException | ||
| | InstantiationException | IllegalAccessException | IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
5b9e661There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/tag jtreg-7.2+1
5b9e661There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sormuras The given tag name
jtreg-7.2+1is not of the formjtreg(?:4\.1-b[0-9]{2}|5\.[01]-b[0-9]{2}|6|-[6789](?:\.[0-9]+)?+[0-9]+).5b9e661There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/tag jtreg-7.2+1
5b9e661There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sormuras A tag with name
jtreg-7.2+1already exists that refers to commit 5b9e661e.