From 61b1de4d5aabf98d43d3a788c9084f80d9f9ab87 Mon Sep 17 00:00:00 2001 From: "Mesbah_Alam@ca.ibm.com" Date: Fri, 23 Apr 2021 12:29:13 -0400 Subject: [PATCH] Replace references of openjdk-systemtest with aqa-systemtest Signed-off-by: Mesbah_Alam@ca.ibm.com --- stf.build/docs/build.md | 6 +++--- stf.build/include/top.xml | 2 +- stf.build/scripts/stf_clone_make.bat | 2 +- stf.build/scripts/stf_clone_make.sh | 2 +- stf.core/docs/STF-GettingStarted.md | 16 ++++++++-------- stf.core/scripts/stf.pl | 6 +++--- .../net/adoptopenjdk/stf/runner/StfRunner.java | 6 +++--- stf.load/docs/README.md | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/stf.build/docs/build.md b/stf.build/docs/build.md index 753f068..4127a8d 100644 --- a/stf.build/docs/build.md +++ b/stf.build/docs/build.md @@ -18,7 +18,7 @@ These prereqs must be installed before attempting to build STF ### Installing the prereqs using the build scripts 1. An internet connection is required 2. Review the list of prereqs listed under 'Installing prereqs manually' and confirm that you accept their license terms. -3. `git clone https://github.com/AdoptOpenJDK/stf.git stf` +3. `git clone https://github.com/adoptium/stf.git stf` 4. Change into the stf.build directory `cd ;stf.build` 5. `make configure` @@ -36,7 +36,7 @@ These prereqs must be installed before attempting to build STF | wget | https://www.gnu.org/copyleft/gpl.html | stf.build | Windows - download from https://sourceforge.net/projects/gnuwin32/files/wget/1.11.4-1/wget-1.11.4-1-bin.zip | Add to PATH | No | ## Building from a command line -1. `git clone https://github.com/AdoptOpenJDK/stf.git stf` +1. `git clone https://github.com/adoptium/stf.git stf` 2. Change into the stf.build directory `cd ;stf.build` 3. `make` @@ -53,6 +53,6 @@ line arguments when the tests execute outside of Eclipse. - Select the directory containing the prereqs. Select import into the new systemtest_prereqs folder. Do not tick the 'Create top level folder' check box (otherwise you get an extra 'systemtest_prereqs' folder which you do not want). -3. `git clone https://github.com/AdoptOpenJDK/stf.git stf` +3. `git clone https://github.com/adoptium/stf.git stf` 4. Import the STF projects into Eclipse (Find and import Eclipse projects) 5. Eclipse should now build the projects without errors (check the 'Problems' view). \ No newline at end of file diff --git a/stf.build/include/top.xml b/stf.build/include/top.xml index 42f68a0..7f88bd7 100644 --- a/stf.build/include/top.xml +++ b/stf.build/include/top.xml @@ -322,7 +322,7 @@ limitations under the License. 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, @@ -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 | @@ -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 ``` @@ -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 +perl $HOME/git/stf/stf.core/scripts/stf.pl -test-root="$HOME/git/aqa-systemtest" -test=UtilLoadTest -dry-run ... C:\stf_temp\20170801-133510-UtilLoadTest (STF creates the results directory yyyymmdd-hhmmss-testname) diff --git a/stf.core/scripts/stf.pl b/stf.core/scripts/stf.pl index 4b5313d..9e8a6e7 100644 --- a/stf.core/scripts/stf.pl +++ b/stf.core/scripts/stf.pl @@ -708,17 +708,17 @@ sub validate_jvm { # /xxxxxx (xxxxxxx) 579397092/1290153920 31238576 Available # # On Windows use dir : -# 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 . #02/02/2017 15:23 .. #02/02/2017 15:23 766 .gitattributes #02/02/2017 15:23 30 .gitignore -#02/02/2017 15:23 openjdk-systemtest +#02/02/2017 15:23 aqa-systemtest # 2 File(s) 796 bytes # 3 Dir(s) 214,264,049,664 bytes free diff --git a/stf.core/src/stf.core/net/adoptopenjdk/stf/runner/StfRunner.java b/stf.core/src/stf.core/net/adoptopenjdk/stf/runner/StfRunner.java index d0743e3..0bbae72 100644 --- a/stf.core/src/stf.core/net/adoptopenjdk/stf/runner/StfRunner.java +++ b/stf.core/src/stf.core/net/adoptopenjdk/stf/runner/StfRunner.java @@ -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(); } diff --git a/stf.load/docs/README.md b/stf.load/docs/README.md index b38272f..16af11d 100644 --- a/stf.load/docs/README.md +++ b/stf.load/docs/README.md @@ -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/adoptium/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: ```