Skip to content

Commit

Permalink
Replace references of openjdk-systemtest with aqa-systemtest
Browse files Browse the repository at this point in the history
  • Loading branch information
Mesbah-Alam committed Apr 23, 2021
1 parent b6833d9 commit 9c8bdef
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion stf.build/include/top.xml
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ limitations under the License.
</target>

<!--
Some tests may require test.debugging requires tools.jar for building (e.g. test.debugging in openjdk-systemtests).
Some tests may require test.debugging requires tools.jar for building (e.g. test.debugging in aqa-systemtests).
tools.jar is shipped with java8, but is built into the jdk in later releases (so does not exist).
The code below looks for tools.jar in Java 8, but only if we are using java 8.
If tools.jar is found, it is copied to PREREQS_ROOT/tools.
Expand Down
14 changes: 7 additions & 7 deletions stf.core/docs/STF-GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ Verify that the Eclipse version works with at least Java 8 by opening
1. The stf projects should now build without build errors.

<a name="2.4"></a>
### Clone and build the openjdk-systemtest git repository
1. Follow the instructions in openjdk.build/docs/readme.md to clone the openjdk-systemtest git repository and set up the prereqs.
### Clone and build the aqa-systemtest git repository
1. Follow the instructions in openjdk.build/docs/readme.md to clone the aqa-systemtest git repository and set up the prereqs.
1. Import these projects into Eclipse alongside the stf projects (Find and import Eclipse projects)
1. Add any additional prereqs from the openjdk-systemtest make configure step to the systemtest_prereqs folder (use File --> Import).
1. Add any additional prereqs from the aqa-systemtest make configure step to the systemtest_prereqs folder (use File --> Import).
1. The openjdk.xxx projects should also now build without build errors.
1. The native (C code) test cases cannot be built automatically by Eclipse.
To build these run the ant build. This can be done from within Eclipse by opening the Ant View,
Expand Down Expand Up @@ -157,9 +157,9 @@ This is obviously useful for getting a full list of all tests, but is also usefu
you want the full test name but only know part of the name.

```
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/openjdk-systemtest" -list
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/aqa-systemtest" -list
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/openjdk-systemtest" -list | grep -i memory
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/aqa-systemtest" -list | grep -i memory
GEN 10:51:58.145 - | test.jlm | TestJlmRemoteMemoryAuth |
GEN 10:51:58.145 - | test.jlm | TestJlmRemoteMemoryNoAuth |
Expand Down Expand Up @@ -197,7 +197,7 @@ to get a UNIX style list of the available options you need to use '-help'
argument in conjunction with a '-test=x' argument.

```
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/openjdk-systemtest" -test=UtilLoadTest -help
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/aqa-systemtest" -test=UtilLoadTest -help
```

<a name="3.5"></a>
Expand All @@ -218,7 +218,7 @@ you can manually run the setup, execute and teardown scripts.

For fully manual execution:
```
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/openjdk-systemtest" -test=UtilLoadTest -dry-run</b>
perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/aqa-systemtest" -test=UtilLoadTest -dry-run</b>
...
C:\stf_temp\20170801-133510-UtilLoadTest
(STF creates the results directory yyyymmdd-hhmmss-testname)
Expand Down
6 changes: 3 additions & 3 deletions stf.core/scripts/stf.pl
Original file line number Diff line number Diff line change
Expand Up @@ -708,17 +708,17 @@ sub validate_jvm {
# /xxxxxx (xxxxxxx) 579397092/1290153920 31238576 Available
#
# On Windows use dir <results_root>:
# C:\git\openjdk-systemtest>dir
# C:\git\aqa-systemtest>dir
# Volume in drive C has no label.
# Volume Serial Number is xxxx-xxxx
#
# Directory of C:\git\openjdk-systemtest
# Directory of C:\git\aqa-systemtest
#
#02/02/2017 15:23 <DIR> .
#02/02/2017 15:23 <DIR> ..
#02/02/2017 15:23 766 .gitattributes
#02/02/2017 15:23 30 .gitignore
#02/02/2017 15:23 <DIR> openjdk-systemtest
#02/02/2017 15:23 <DIR> aqa-systemtest
# 2 File(s) 796 bytes
# 3 Dir(s) 214,264,049,664 bytes free

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -748,9 +748,9 @@ private void generateHelpText(StfPluginRootInterface pluginObject, Method helpMe
+ "add the directory containing Stf.pl to the system path.");

help.outputSection("Example commands");
help.outputText("$ stf -test-root=$HOME/git/openjdk-systemtest -test=LambdaLoadTest");
help.outputText("$ stf -test-root=$HOME/git/openjdk-systemtest -test=MathLoadTest -test-args=\"workload=autoSimd\"");
help.outputText("$ stf -test-root=$HOME/git/openjdk-systemtest -test=MathLoadTest -test-args=\"workload=bigDecimal\" -dry-run");
help.outputText("$ stf -test-root=$HOME/git/aqa-systemtest -test=LambdaLoadTest");
help.outputText("$ stf -test-root=$HOME/git/aqa-systemtest -test=MathLoadTest -test-args=\"workload=autoSimd\"");
help.outputText("$ stf -test-root=$HOME/git/aqa-systemtest -test=MathLoadTest -test-args=\"workload=bigDecimal\" -dry-run");

help.outputLine();
}
Expand Down
2 changes: 1 addition & 1 deletion stf.load/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ The Mauve code which verifies test conditions prefixes some output text with a '
However, many Mauve tests don't give any positive or negative confirmation so, although assumed
to pass, are given an 'unknown' result status.

Of course, executing the mauve tests requires that they are available. See the https://github.com/AdoptOpenJDK/openjdk-systemtest project for details
Of course, executing the mauve tests requires that they are available. See the https://github.com/AdoptOpenJDK/aqa-systemtest project for details
of how to enable this feature. Once the test cases are built a single test can be executed outside of the test.load
harness as follows:
```
Expand Down

0 comments on commit 9c8bdef

Please sign in to comment.