added the if statement

[Hana3706]

solved the issue #5297
add a if statement

[llxia]

DYNAMIC_COMPILE is a boolean, not a string. Please change the code to the following:

String makeTestCmd = "$RESOLVED_MAKE";cd. /aqa-tests/TKG; \$MAKE $testParam"
if (env.DYNAMIC_COMPILE) {
   makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
}

[llxia]

please remove else

[llxia]

Please update the description to use https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

[Hana3706]

testenvSettings.sh should run only once

All four commits do the same thing, was a git mistake on my side

Fixed #5297 and #5341

signed-off-by: Hana [email protected]

[llxia]

Thanks @Hana3706 for the update. However, the code does not match the suggested #5341 (comment)
Also, please do not include other changes that are unrelated to this issue. Thanks

[Hana3706]

@llxia am so sorry for this but can you point out to me how it doesn't match the code bcs on my local computer the code is updated to match the suggested changes, perhaps there was an issue with the version I commit...

[LongyuZhang]

Hi @Hana3706 Usually you can rebase to keep the PR up-to-date with the upstream repo. For your current case, it might be easier to create a new branch with the following steps:

• make a copy of current branch (git checkout -b <new_branch_1>)
• checkout your master branch, fetch upstream, then rebase it to the latest
• Delete your current branch my_new_branch locally, then re-create new my_new_branch from master
• Make the changes (you can refer previous copied branch <new_branch_1>), commit and force push, then this PR will be updated.

[Hana3706]

@LongyuZhang thanks a lot for the feedback!
I was just wondering why I need to create a new branch? As well as that, I want to better understand what is wrong with the update I made so I can fix it again.
Finally, how do I rebase to the latest branch upstream and how do I delete a branch locally...
am so sorry for the many questions :)
thanks again!

[LongyuZhang]

@Hana3706 If you can rebase on the currently branch, it would be great. I suggested re-create new branch since you commits may already mixed with merged commits. So feel free to try rebase on this branch first.
Regarding the rebase, you can follow https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork to add adoptium/aqa-tests as the upstream, fetch it to your local, then use git rebase upstream/master command to update your branch.

[LongyuZhang]

the cd. should be cd .

[LongyuZhang]

This comment should be moved into the if block too

[Hana3706]

To make sure, do you want me to move the import otf.tap4j.model.TestSet comment inside my if statement on line 10 or before it on line 9?

[LongyuZhang]

This comment // Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead. is for makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam", so they should be together.

[smlambert]

Suggested change

	if (env.DYNAMIC_COMPILE){
	makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
	}
	if (env.DYNAMIC_COMPILE){
	// Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead.
	makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
	}

[smlambert]

Suggested change

	String makeTestCmd = "$RESOLVED_MAKE";cd. /aqa-tests/TKG; \$MAKE $testParam"
	String makeTestCmd = "$RESOLVED_MAKE";cd ./aqa-tests/TKG; \$MAKE $testParam"

[llxia]

@Hana3706 are you still working on this PR? If so, please address the above comments. Thanks

[smlambert]

Closing as stale. Reopen if requested updates are made.