Pulled the changes

adoptium · May 14, 2024 · 1559534 · 1559534
1 parent e99edbc
commit 1559534
Show file tree

Hide file tree

Showing 23 changed files with 134 additions and 336 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL

diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
@@ -19,7 +19,7 @@ jobs:
  id: workflow_run_info
  # Checkout current (TKG) repo to access the repo-specific config file `.github/workflows/runAqaConfig.json` and the shared script `scripts/testRepo/runAqaArgParse.py`
  - name: Checkout current repo
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  path: 'main'
  - name: Parse parameters
@@ -40,7 +40,7 @@ jobs:
  id: output_log
  - name: Create error comment
  if: failure()
- uses: actions/github-script@v6
+ uses: actions/github-script@v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -62,7 +62,7 @@ jobs:
  run: echo ::set-output name=failed::true
  id: failure_report
  - name: Create success comment
- uses: actions/github-script@v6
+ uses: actions/github-script@v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -107,7 +107,7 @@ jobs:
  sourceType: 'buildType'
  impl: ${{ matrix.jdk_impl }}
  - name: Checkout PR Ref
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  if: matrix.sdk_resource == 'build-jdk'
  with:
  repository: ${{ matrix.build_repo_branch.repo }}
@@ -129,7 +129,7 @@ jobs:
  sourceType: 'url'
  impl: ${{ matrix.jdk_impl }}
  # get-pr step by @Simran-B https://github.com/actions/checkout/issues/331#issuecomment-707103442
- - uses: actions/github-script@v6
+ - uses: actions/github-script@v7.0.1
  id: get-pr
  with:
  script: |
@@ -168,7 +168,7 @@ jobs:
  openjdk_testRepo: ${{ matrix.openjdk_testrepo }}
  openj9_repo: ${{ matrix.openj9_repo }}
  tkg_Repo: '${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}:${{ fromJSON(steps.get-pr.outputs.result).head.ref }}'
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
  if: failure()
  with:
  name: test_output
@@ -180,7 +180,7 @@ jobs:
  if: failure() && !needs.parseComment.outputs.failed
  steps:
  - name: Create comment
- uses: actions/github-script@v6
+ uses: actions/github-script@v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -201,7 +201,7 @@ jobs:
  if: cancelled()
  steps:
  - name: Create comment
- uses: actions/github-script@v6
+ uses: actions/github-script@v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -222,7 +222,7 @@ jobs:
  if: success()
  steps:
  - name: Create comment
- uses: actions/github-script@v6
+ uses: actions/github-script@v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |

diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml
@@ -2,23 +2,31 @@ name: "Run TKG Tests"
 on:
  issue_comment:
  types: [created]
+permissions:
+ contents: write
+ issues: write
+ pull-requests: write
 jobs:
  testTKG:
+ permissions:
+ contents: write
+ issues: write
+ pull-requests: write
  runs-on: ubuntu-latest
  if: startsWith(github.event.comment.body, 'run tkg-test')
  steps:
- - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  ref: refs/pull/${{ github.event.issue.number }}/head
 
  - name: Set up JDK
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+ uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
  with:
  distribution: 'temurin'
  java-version: 11
 
  - name: Create success comment
- uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -53,7 +61,7 @@ jobs:
  if: failure()
  steps:
  - name: Create comment
- uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -73,7 +81,7 @@ jobs:
  if: cancelled()
  steps:
  - name: Create comment
- uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |
@@ -93,7 +101,7 @@ jobs:
  if: success()
  steps:
  - name: Create comment
- uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  github-token: ${{secrets.GITHUB_TOKEN}}
  script: |

diff --git a/compile.mk b/compile.mk
@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJDK_VENDOR=$(JDK_VENDOR) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
 
 
 compile:

diff --git a/examples/base/playlist.xml b/examples/base/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
  <test>
  <testCaseName>testSuccess</testCaseName>
  <command>echo "success"; \

diff --git a/examples/feature/playlist.xml b/examples/feature/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
  <test>
  <testCaseName>testFeatureFips</testCaseName>
  <command>echo "match FIPS140_3_20220501 and everything else by default"; \

diff --git a/examples/hierarchy/a1/b1/playlist.xml b/examples/hierarchy/a1/b1/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a1_b1</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a2/b2/c2/playlist.xml b/examples/hierarchy/a2/b2/c2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a2_b2_c2</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a2/b2/playlist.xml b/examples/hierarchy/a2/b2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a2_b2</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a2/d2/playlist.xml b/examples/hierarchy/a2/d2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a2_d2</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a2/playlist.xml b/examples/hierarchy/a2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a2</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a3/b3/playlist.xml b/examples/hierarchy/a3/b3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a3_b3</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a3/c3/d3/playlist.xml b/examples/hierarchy/a3/c3/d3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a3_b3_c3_d3</testCaseName>
  <command>echo "success"; \

diff --git a/examples/hierarchy/a3/f3/playlist.xml b/examples/hierarchy/a3/f3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
  <test>
  <testCaseName>test_a3_f3</testCaseName>
  <command>echo "success"; \

diff --git a/examples/jdkVersion/playlist.xml b/examples/jdkVersion/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
  <test>
  <testCaseName>test_ver_11</testCaseName>
  <command>echo "test for version 11"; \

diff --git a/examples/platformRequirements/playlist.xml b/examples/platformRequirements/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
  <test>
  <testCaseName>test_arch_x86</testCaseName>
  <command>echo "test arch.x86"; \
@@ -107,5 +107,73 @@
  $(TEST_STATUS)</command>
  <platformRequirements>^os.linux.ubuntu.20+</platformRequirements>
  </test>
+ <test>
+ <testCaseName>test_not_arch_390</testCaseName>
+ <command>echo "test on none arch.390"; \
+ $(TEST_STATUS)</command>
+ <platformRequirements>^arch.390</platformRequirements>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_x86_skylake</testCaseName>
+ <command>echo "test arch.x86.skylake"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.x86.skylake</platformRequirements>
+ </platformRequirementsList>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_390_z15plus</testCaseName>
+ <command>echo "test arch.390.z15+"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z15+</platformRequirements>
+ </platformRequirementsList>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_390_z15</testCaseName>
+ <command>echo "test arch.390.z15"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z15</platformRequirements>
+ </platformRequirementsList>
+ </test>
+ <test>
+ <testCaseName>test_arch_390_z14plus</testCaseName>
+ <command>echo "test arch.390.z14+"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z14+</platformRequirements>
+ </platformRequirementsList>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_390_z14</testCaseName>
+ <command>echo "test arch.390.z14"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z14</platformRequirements>
+ </platformRequirementsList>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_390_z13plus</testCaseName>
+ <command>echo "test arch.390.z13+"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z13+</platformRequirements>
+ </platformRequirementsList>
+ </test>
+
+ <test>
+ <testCaseName>test_arch_390_z13</testCaseName>
+ <command>echo "test arch.390.z13"; \
+ $(TEST_STATUS)</command>
+ <platformRequirementsList>
+ <platformRequirements>arch.390.z13</platformRequirements>
+ </platformRequirementsList>
+ </test>
 
-</playlist>
+</playlist>
diff --git a/examples/rerun/playlist.xml b/examples/rerun/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
  <test>
  <testCaseName>testRerun</testCaseName>
  <command>echo "test rerun"; \

diff --git a/examples/rerun/rerunSub/playlist.xml b/examples/rerun/rerunSub/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
  <test>
  <testCaseName>testRerunSubDir</testCaseName>
  <command>echo "test rerun in sub dir"; \

diff --git a/examples/sliceAndDice/level/playlist.xml b/examples/sliceAndDice/level/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
  <test>
  <testCaseName>testDefault</testCaseName>
  <command>echo "default is extended"; \

diff --git a/makeGen.mk b/makeGen.mk
@@ -28,7 +28,7 @@ P=:
 Q="
 
 TKG_JAR = .$(D)bin$(D)TestKitGen.jar
-JSON_SIMPLE = .$(D)lib$(D)json-simple.jar
+JSON_SIMPLE = $(LIB_DIR)$(D)json-simple.jar
 
 ifneq (,$(findstring Win,$(OS)))
 CURRENT_DIR := $(subst \,/,$(CURRENT_DIR))
@@ -42,7 +42,7 @@ autoconfig:
  perl scripts$(D)configure.pl
 
 autogen: autoconfig
- ${TEST_JDK_HOME}/bin/java -cp $(Q)$(TKG_JAR)$(P)$(JSON_SIMPLE)$(Q) org.testKitGen.MainRunner --mode=$(MODE) --spec=$(SPEC) --microArch=$(MICROARCH) --osLabel=$(Q)$(OS_LABEL)$(Q) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --vendor=$(Q)$(JDK_VENDOR)$(Q) --buildList=${BUILD_LIST} --iterations=$(TKG_ITERATIONS) --aotIterations=$(AOT_ITERATIONS) --testFlag=$(TEST_FLAG) --testTarget=$(TESTTARGET) --testList=$(TESTLIST) --numOfMachines=$(NUM_MACHINES) --testTime=$(TEST_TIME) --TRSSURL=$(TRSS_URL) $(OPTS)
+ ${TEST_JDK_HOME}/bin/java -cp $(Q)$(TKG_JAR)$(P)$(JSON_SIMPLE)$(Q) org.testKitGen.MainRunner --mode=$(MODE) --spec=$(SPEC) --microArch=$(Q)$(MICROARCH)$(Q) --osLabel=$(Q)$(OS_LABEL)$(Q) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --vendor=$(Q)$(JDK_VENDOR)$(Q) --buildList=${BUILD_LIST} --iterations=$(TKG_ITERATIONS) --aotIterations=$(AOT_ITERATIONS) --testFlag=$(TEST_FLAG) --testTarget=$(TESTTARGET) --testList=$(TESTLIST) --numOfMachines=$(NUM_MACHINES) --testTime=$(TEST_TIME) --TRSSURL=$(TRSS_URL) $(OPTS)
 
 AUTOGEN_FILES = $(wildcard $(CURRENT_DIR)$(D)jvmTest.mk)
 AUTOGEN_FILES += $(wildcard $(CURRENT_DIR)$(D)machineConfigure.mk)