fix stf to STF

[xius666]

issue #2949

[sophia-guo]

According to the failure, we'll need the related changes in https://github.com/adoptium/aqa-systemtest/blob/master/openjdk.build/build.xml#L32. Probably a few other places. I will take a look. This one is ready for merge.

[llxia]

@xius666 Do we test this PR in Grinder?

[sophia-guo]

combined with adoptium/aqa-systemtest#469 grinder: https://ci.adoptopenjdk.net/job/Grinder/1883/

[sophia-guo]

@xius666 we missed one more place, could you please also update the line https://github.com/adoptium/aqa-tests/blob/master/system/systemtest.mk#L50 as

perl $(SYSTEMTEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl
-test-root=$(Q)$(SYSTEMTEST_RESROOT)$(D)stf;$(SYSTEMTEST_RESROOT)$(D)aqa-systemtest$(OPENJ9_PRAM)$(Q)
-systemtest-prereqs=$(Q)$(SYSTEMTEST_RESROOT)$(D)systemtest_prereqs$(Q)
-java-args=$(SQ)$(JVM_OPTIONS)$(SQ)
-results-root=$(REPORTDIR)
endef

Basically just two places of stf directory to STF.

Thanks!

[sophia-guo]

rerun: https://ci.adoptopenjdk.net/job/Grinder/1889/console

[xius666]

Thanks for the change

rerun: https://ci.adoptopenjdk.net/job/Grinder/1889/console

[smlambert]

I am happy to approve this, the only thing left is @llxia 's question in her review about Why do we remove !params.USE_TESTENV_PROPERTIES?

So I will leave to Lan as 2nd review.

[llxia]

@xius666 could you address my concern #3038 (comment) ? Thanks

[smlambert]

LGTM with 1 minor spacing request

[llxia]

Running internal zos Grinder/18915/

00:19:03.229  BUILD FAILED
00:19:03.229  /home/jenkins/workspace/Grinder/aqa-tests/TKG/scripts/build_test.xml:82: The following error occurred while executing this line:
00:19:03.230  /home/jenkins/workspace/Grinder/aqa-tests/system/common.xml:381: The following error occurred while executing this line:
00:19:03.230  /home/jenkins/workspace/Grinder/aqa-tests/system/common.xml:326: The following error occurred while executing this line:
00:19:03.230  /home/jenkins/workspace/Grinder/aqa-tests/system/openj9-systemtest/openj9.build/build.xml:45: Cannot find /home/jenkins/workspace/Grinder/aqa-tests/system/stf/stf.build/include/top.xml imported from /home/jenkins/workspace/Grinder/aqa-tests/system/openj9-systemtest/openj9.build/build.xml
00:19:03.230  
00:19:03.230  Total time: 28 seconds
00:19:04.703  1
00:19:04.704  compile.mk:39: recipe for target 'compile' failed
00:19:04.704  make[1]: *** [compile] Error 1
00:19:04.704  make[1]: Leaving directory '/home/jenkins/workspace/Grinder/aqa-tests/TKG'
00:19:04.704  makefile:66: recipe for target 'compile' failed
00:19:04.704  make: *** [compile] Error 2

[llxia]

Same failure on xlinux with openj9-systemtest : https://ci.adoptopenjdk.net/job/Grinder/1939/
It looks like we need a 3rd PR to update openj9-systemtest repo.

[llxia]

Issue opened at openj9-systemtest repo: adoptium/openj9-systemtest#138

[smlambert]

I see Shiyu's PR for the openj9-systemtest issue, so I will plan to run a Grinder or 2 and then merge the 3 related PRs together (this one, adoptium/openj9-systemtest#139 and adoptium/aqa-systemtest#469).

[llxia]

Running Grinder on zos: Grinder/19049

Update: the above Grinder passed.

[llxia]

xlinux: https://ci.adoptopenjdk.net/job/Grinder/2054/

[llxia]

Thanks @xius666