Testflag

.github/workflows/codeql-analysis.yml

@@ -46,7 +46,7 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+ uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
  with:
  languages: ${{ matrix.language }}
  # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+ uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+ uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9

.github/workflows/testTKG.yml

@@ -20,7 +20,7 @@ jobs:
  ref: refs/pull/${{ github.event.issue.number }}/head
 
  - name: Set up JDK
- uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+ uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
  with:
  distribution: 'temurin'
  java-version: 11

scripts/testTKG/test_platformRequirements.py

@@ -149,10 +149,11 @@ def run_test():
  skipped.add('test_not_arch_390_0')
  else:
  passed.add('test_not_arch_390_0')
+ passed.add('test_not_arch_390_z15plus_0')
 
  if 'test_arch_390_z15_0' not in passed:
  skipped.add('test_arch_390_z15_0')
-
+ 
  if 'test_arch_390_z14_0' not in passed:
  skipped.add('test_arch_390_z14_0')
 

src/org/testKitGen/TestInfoParser.java

@@ -88,11 +88,15 @@ public TestInfo parse() {
  ti.addFeature(featElements[0].toLowerCase(), featElements[1].toLowerCase());
  }
  Set<String> testFlags = new HashSet<>(arg.getTestFlag());
+ boolean requiredFeatureFound = false;
+ boolean hasRequiredFeature = false; 
  for (Map.Entry<String,String> entry : ti.getFeatures().entrySet()) {
  String featureOpt = entry.getValue().toLowerCase();
  if (featureOpt.equals("required")) {
- if (!isFeatureInTestFlags(testFlags, entry.getKey())) {
- return null;
+ hasRequiredFeature = true;
+ if (isFeatureInTestFlags(testFlags, entry.getKey())) {
+ requiredFeatureFound = true;
+ break;
  }
  } else if (featureOpt.equals("nonapplicable")) {
  // Do not generate make target if the test is not applicable for one feature defined in TEST_FLAG
@@ -106,7 +110,9 @@ public TestInfo parse() {
  System.exit(1);
  }
  }
-
+ if (hasRequiredFeature && !requiredFeatureFound) {
+ return null;
+ }
  if (testFlags.contains("aot")) {
  for (Map.Entry<String,String> entry : ti.getFeatures().entrySet()) {
  if (doesFeatureMatchTestFlag("aot", entry.getKey())) {