Skip to content

Commit 12aadc4

Browse files
authored
Replace references of openjdk-systemtest with aqa-systemtest (adoptium#425)
Signed-off-by: [email protected] <[email protected]>
1 parent 0eb9f57 commit 12aadc4

File tree

26 files changed

+93
-93
lines changed

26 files changed

+93
-93
lines changed

openjdk.build/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ limitations under the License.
2525
<!-- Assumes source repositories are checked out under a common root and the repository
2626
has been built in-situ - i.e.
2727
stf repository: /home/userid/git/stf
28-
openjdk-systemtest repository: /home/userid/git/openjdk-systemtest
28+
aqa-systemtest repository: /home/userid/git/aqa-systemtest
2929
If the stf repository has been cloned or built to a different location, the stf_root property
3030
must be set on the command line - e.g. -Dstf_root=/my_stf_build_dir
3131
-->
3232
<property name="stf_root" location="${source_root}/../stf"/>
33-
<property name="openjdk_systemtest_root" location="${source_root}/../openjdk-systemtest"/>
33+
<property name="openjdk_systemtest_root" location="${source_root}/../aqa-systemtest"/>
3434

3535
<!-- Import stf settings. -->
3636
<import file="${stf_root}/stf.build/include/top.xml"/>

openjdk.build/docs/build.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
# openjdk-systemtest Repository Build
1+
# aqa-systemtest Repository Build
22

33
Basic process is:
44
1. Install prereqs
55
1. clone the System Test Framework (stf) git repository
6-
1. clone this (openjdk-systemtest) git repository
6+
1. clone this (aqa-systemtest) git repository
77
1. make configure (installs some other prereqs)
8-
1. make (or make build - builds the stf and openjdk-systemtest repositories)
8+
1. make (or make build - builds the stf and aqa-systemtest repositories)
99
1. make test (runs a basic set of tests (all the tests in default (no -Xoptions) mode))
1010

11-
## Prereqs which cannot be installed by the openjdk-systemtest build scripts
12-
These prereqs must be installed before attempting to build openjdk-systemtest
11+
## Prereqs which cannot be installed by the aqa-systemtest build scripts
12+
These prereqs must be installed before attempting to build aqa-systemtest
1313
1. ant version 1.8.4 or later
1414
1. Java 8 or later (any implementation)
1515
1. GNU make 3.79 or later
1616
1. wget (optional - required to install other prereqs automatically)
1717

18-
## Prereqs which can be installed by the openjdk-systemtest build scripts
18+
## Prereqs which can be installed by the aqa-systemtest build scripts
1919
### Installing the prereqs using the build scripts
2020
1. An internet connection is required
2121
1. Review the list of prereqs listed under ' Installing prereqs manually' and confirm that you accept their license terms.
22-
1. git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
22+
1. git clone https://github.com/adoptium/aqa-systemtest.git aqa-systemtest
2323
1. cd &lt;git-root&gt;openjdk.build
2424
1. make configure
2525

@@ -40,8 +40,8 @@ These prereqs must be installed before attempting to build openjdk-systemtest
4040
| wget | https://www.gnu.org/copyleft/gpl.html | stf.build, openjdk.build | Windows - download from https://sourceforge.net/projects/gnuwin32/files/wget/1.11.4-1/wget-1.11.4-1-bin.zip<br>This needs below dependency so download it from <br>https://sourceforge.net/projects/gnuwin32/files/wget/1.11.4-1/wget-1.11.4-1-dep.zip | Add both downloads to PATH | No |
4141

4242
## Building from a command line
43-
1. git clone https://github.com/AdoptOpenJDK/stf.git stf
44-
1. git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
43+
1. git clone https://github.com/adoptium/stf.git stf
44+
1. git clone https://github.com/adoptium/aqa-systemtest.git aqa-systemtest
4545
1. cd &lt;git-root&gt;openjdk.build
4646
1. make
4747

@@ -50,7 +50,7 @@ These prereqs must be installed before attempting to build openjdk-systemtest
5050
in the project .classpath files to work out the test dependencies and are translated into -classpath command
5151
line arguments when the tests execute.
5252
1. Create a new Eclipse workspace. Once configured the workspace will reference multiple git repositories and a local directory containing the test prereqs.
53-
1. Install the prereqs following the instructions in 'Installing prereqs' (e.g. clone the stf and openjdk-systemtest repositories and run make configure for the openjdk-systemtest repo).
53+
1. Install the prereqs following the instructions in 'Installing prereqs' (e.g. clone the stf and aqa-systemtest repositories and run make configure for the aqa-systemtest repo).
5454
1. Create a 'General Project' in your Eclipse workspace called systemtest_prereqs.
5555
1. Import the prereqs into the Eclipse workspace
5656
- Create a General Project in Eclipse called systemtest_prereqs
@@ -61,8 +61,8 @@ want).
6161
1. Import the prereqs into the systemtest_prereqs project in the Eclipse workspace - Import --> File System and then locate the systemtest_prereqs directory. Do not select the 'Create top level directory' (otherwise you will get an extra systemtest_prereqs directory which you don't want).
6262
1. Import the STF projects into Eclipse (Find and import Eclipse projects from the STF git repo)
6363
1. Eclipse should now build the stf projects without error (check the 'Problems' view).
64-
1. Import the openjdk-systemtest projects into Eclipse (Find and import Eclipse projects)
65-
1. Eclipse should now build the openjdk-systemtest (openjdk.xxxx) projects without error (check the 'Problems' view).
64+
1. Import the aqa-systemtest projects into Eclipse (Find and import Eclipse projects)
65+
1. Eclipse should now build the aqa-systemtest (openjdk.xxxx) projects without error (check the 'Problems' view).
6666

6767
## Running tests
6868
### Running via make
@@ -98,20 +98,20 @@ repository to generate makefiles to run the tests.
9898
### Running stf.pl directly
9999
For debugging test failures and developing new tests you are likely to want to STF directly on the command line yourself.
100100
```
101-
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/openjdk-systemtest" -list
101+
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/aqa-systemtest" -list
102102
```
103-
will list all the tests in the stf and openjdk-systemtest repositories (the stf repository contains sample tests).
103+
will list all the tests in the stf and aqa-systemtest repositories (the stf repository contains sample tests).
104104
```
105-
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/openjdk-systemtest" -test=xxxx
105+
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/aqa-systemtest" -test=xxxx
106106
```
107107
will execute the test xxxx.
108108
Some tests require test specific arguments:
109109
```
110-
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/openjdk-systemtest" -test=xxxx
110+
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/aqa-systemtest" -test=xxxx
111111
```
112112
JVM arguments can be passed to the Java command run during the test via:
113113
```
114-
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/openjdk-systemtest" -java-args="-Xint" -test=xxxx
114+
perl $HOME/git/stf/stf.pl -test-root="$HOME/git/aqa-systemtest" -java-args="-Xint" -test=xxxx
115115
```
116-
For a full list of ways to direct stf behaviour refer to the stf documentation in the stf repository https://github.com/AdoptOpenJDK/stf.
116+
For a full list of ways to direct stf behaviour refer to the stf documentation in the stf repository https://github.com/adoptium/stf.
117117

openjdk.build/scripts/openjdk-systemtest-clone-make.bat

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ REM limitations under the License.
1313
REM Save current directory
1414
set currdir=%cd%
1515
REM Clone stf
16-
(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST stf rmdir /s /q stf) && git clone https://github.com/AdoptOpenJDK/stf.git stf
17-
REM Clone openjdk-systemtest
18-
(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST openjdk-systemtest rmdir /s /q openjdk-systemtest) && git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
16+
(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST stf rmdir /s /q stf) && git clone https://github.com/adoptium/stf.git stf
17+
REM Clone aqa-systemtest
18+
(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST aqa-systemtest rmdir /s /q aqa-systemtest) && git clone https://github.com/adoptium/aqa-systemtest.git aqa-systemtest
1919
REM Configure (get prereqs)
20-
cd %USERPROFILE%\git\openjdk-systemtest\openjdk.build
20+
cd %USERPROFILE%\git\aqa-systemtest\openjdk.build
2121
make configure
2222
IF ERRORLEVEL 1 cd %currdir% && exit /B 1
2323
REM Build
24-
cd %USERPROFILE%\git\openjdk-systemtest\openjdk.build
24+
cd %USERPROFILE%\git\aqa-systemtest\openjdk.build
2525
make
2626
IF ERRORLEVEL 1 cd %currdir% && exit /B 1
27-
@echo openjdk-systemtest repository build successful - to run the tests
28-
@echo cd %USERPROFILE%\git\openjdk-systemtest\openjdk.build && make test
27+
@echo aqa-systemtest repository build successful - to run the tests
28+
@echo cd %USERPROFILE%\git\aqa-systemtest\openjdk.build && make test
2929
REM Restore current directory
3030
cd %currdir%
3131
exit /B 0

openjdk.build/scripts/openjdk-systemtest-clone-make.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
#-------------------------------------------------------------------------
1515

1616
# Clone stf
17-
mkdir -p $HOME/git && cd $HOME/git && rm -rf stf && mkdir stf && git clone https://github.com/AdoptOpenJDK/stf.git stf
17+
mkdir -p $HOME/git && cd $HOME/git && rm -rf stf && mkdir stf && git clone https://github.com/adoptium/stf.git stf
1818
if [ "$?" != "0" ]; then
1919
echo "Error cloning stf" 1>&2
2020
exit 1
2121
fi
22-
# Clone openjdk-systemtest
23-
mkdir -p $HOME/git && cd $HOME/git && rm -rf openjdk-systemtest && mkdir openjdk-systemtest && git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
22+
# Clone aqa-systemtest
23+
mkdir -p $HOME/git && cd $HOME/git && rm -rf aqa-systemtest && mkdir aqa-systemtest && git clone https://github.com/adoptium/aqa-systemtest.git aqa-systemtest
2424
if [ "$?" != "0" ]; then
25-
echo "Error cloning openjdk-systemtest" 1>&2
25+
echo "Error cloning aqa-systemtest" 1>&2
2626
exit 1
2727
fi
2828
# Configure (get prereqs)
29-
cd $HOME/git/openjdk-systemtest/openjdk.build/ && make configure
29+
cd $HOME/git/aqa-systemtest/openjdk.build/ && make configure
3030
if [ "$?" != "0" ]; then
31-
echo "Error configuring openjdk-systemtest - see build output" 1>&2
31+
echo "Error configuring aqa-systemtest - see build output" 1>&2
3232
exit 1
3333
fi
3434
# Build
35-
cd $HOME/git/openjdk-systemtest/openjdk.build/ && make
35+
cd $HOME/git/aqa-systemtest/openjdk.build/ && make
3636
if [ "$?" != "0" ]; then
37-
echo "Error building openjdk-systemtest - see build output" 1>&2
37+
echo "Error building aqa-systemtest - see build output" 1>&2
3838
exit 1
3939
fi
40-
echo "openjdk-systemtest repository build successful - to run the tests"
41-
echo "make -f $HOME/git/openjdk-systemtest/openjdk.build/makefile test"
40+
echo "aqa-systemtest repository build successful - to run the tests"
41+
echo "make -f $HOME/git/aqa-systemtest/openjdk.build/makefile test"
4242
exit 0

openjdk.test.classloading/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<!-- Assumes source repositories are checked out under a common root and the repository
2626
has been built in-situ - i.e.
2727
stf repository: /home/userid/git/stf
28-
openjdk-systemtest repository: /home/userid/git/openjdk-systemtest
28+
aqa-systemtest repository: /home/userid/git/aqa-systemtest
2929
If the stf repository has been cloned or built to a different location, the stf_root property
3030
must be set on the command line - e.g. -Dstf_root=/my_stf_build_dir
3131
-->

openjdk.test.concurrent/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<!-- Assumes source repositories are checked out under a common root and the repository
2626
has been built in-situ - i.e.
2727
stf repository: /home/userid/git/stf
28-
openjdk-systemtest repository: /home/userid/git/openjdk-systemtest
28+
aqa-systemtest repository: /home/userid/git/aqa-systemtest
2929
If the stf repository has been cloned or built to a different location, the stf_root property
3030
must be set on the command line - e.g. -Dstf_root=/my_stf_build_dir
3131
-->

openjdk.test.debugging/docs/JDI_README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,18 @@ It is also possible to run these tests without automation and STF aid, however d
102102

103103
The way to manually run the tests is using the property file such as:
104104

105-
$JAVA_HOME/bin/java -Djava.net.preferIPv4Stack=true -classpath $HOME/git/openjdk-systemtest/openjdk.test.debugging/bin:$JAVA_HOME/lib/tools.jar net.adoptopenjdk.test.jdi.debugger.Connectors $HOME/git/openjdk-systemtest/openjdk.test.debugging/src/test.debugging/com/ibm/runtimes/jdi/properties/basic_launch.prop dt_socket $HOME/git/openjdk-systemtest/openjdk.test.debugging/bin
105+
$JAVA_HOME/bin/java -Djava.net.preferIPv4Stack=true -classpath $HOME/git/aqa-systemtest/openjdk.test.debugging/bin:$JAVA_HOME/lib/tools.jar net.adoptopenjdk.test.jdi.debugger.Connectors $HOME/git/aqa-systemtest/openjdk.test.debugging/src/test.debugging/com/ibm/runtimes/jdi/properties/basic_launch.prop dt_socket $HOME/git/aqa-systemtest/openjdk.test.debugging/bin
106106

107107
The simplest way of connecting is using the launch type of connection which does not require any other process to be started.
108108
Remember if the properties file contains a connection type of listening or attach these will need to be started in a separate process. The listening connection should be started before the debugger is run, the attaching should be run afterwards.
109109

110110
To start a vm listening, use:
111111

112-
$JAVA_HOME/bin/java -Xrunjdwp:transport=dt_socket,address=800,server=y -Xdebug -Xnoagent -Djava.compiler=NONE -classpath $HOME/git/openjdk-systemtest/openjdk.test.debugging/bin net.adoptopenjdk.test.jdi.targetvm.HellowWorld
112+
$JAVA_HOME/bin/java -Xrunjdwp:transport=dt_socket,address=800,server=y -Xdebug -Xnoagent -Djava.compiler=NONE -classpath $HOME/git/aqa-systemtest/openjdk.test.debugging/bin net.adoptopenjdk.test.jdi.targetvm.HellowWorld
113113

114114
To get a vm to attach to the debugger, use:
115115

116-
$JAVA_HOME/bin/java -Xrunjdwp:transport=dt_socket,address=800 -classpath $HOME/git/openjdk-systemtest/openjdk.test.debugging/bin net.adoptopenjdk.test.jdi.targetvm.HellowWorld
116+
$JAVA_HOME/bin/java -Xrunjdwp:transport=dt_socket,address=800 -classpath $HOME/git/aqa-systemtest/openjdk.test.debugging/bin net.adoptopenjdk.test.jdi.targetvm.HellowWorld
117117

118118
Port doesn't have to be 800, just needs to be the same on listener and attacher! Note: to work on linux the port must be higher than 1024.
119119

openjdk.test.gc/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<!-- Assumes source repositories are checked out under a common root and the repository
2626
has been built in-situ - i.e.
2727
stf repository: /home/userid/git/stf
28-
openjdk-systemtest repository: /home/userid/git/openjdk-systemtest
28+
aqa-systemtest repository: /home/userid/git/aqa-systemtest
2929
If the stf repository has been cloned or built to a different location, the stf_root property
3030
must be set on the command line - e.g. -Dstf_root=/my_stf_build_dir
3131
-->

openjdk.test.jck/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
<property name="stf_root" location="${source_root}/../stf"/>
2424

2525
<!--Set default system test location-->
26-
<property name="openjdk_systemtest_root" location="${source_root}/../openjdk-systemtest"/>
26+
<property name="openjdk_systemtest_root" location="${source_root}/../aqa-systemtest"/>
2727
<property name="jck_makefile_dir" value="${openjdk_systemtest_root}/openjdk.test.jck/src/native"/>
2828

2929
<!--Set default JCK location. Relies on environment variables JCK_ROOT and JCK_VERSION -->

0 commit comments

Comments
 (0)