Create a common makefile for D, P, Q, SQ #188

2001asjad · 2021-04-27T13:25:59Z

Added a common makefile in the project repository for the common macros like D, P, Q etc are defined and they have been included in the rest of the makefiles using include .

Fixes #159

2001asjad · 2021-04-27T16:43:17Z

@smlambert @llxia Can you please take a look at my PR and suggest me if I have to make changes or not ?
Thank You.

renfeiw · 2021-04-27T18:08:44Z

@2001asjad Thanks! A suggestion for any future PRs. Actually you don't need to close the other PR and create a new. Instead, you can amend your commit directly.

common.mk

2001asjad · 2021-04-27T18:30:51Z

@2001asjad Thanks! A suggestion for any future PRs. Actually you don't need to close the other PR and create a new. Instead, you can amend your commit directly.

Yeah sure.. It was a silly mistake from my side. Gonna take care the next time. Will update you soon with the addressed changes

2001asjad · 2021-04-27T18:52:51Z

@renfeiw done...

renfeiw · 2021-04-28T13:32:02Z

run aqa --sdk_resource nightly --build_list openjdk --target sanity.openjdk --jdk_version 11 --jdk_impl hotspot --platform x86-64_linux

github-actions · 2021-04-28T13:35:04Z

@renfeiw Build(s) started with the following parameters:

sdk_resource: ['nightly']
customized_sdk_url: ['None']
archive_extension: ['.tar']
build_list: ['openjdk']
target: ['_sanity.openjdk']
platform: ['ubuntu-latest']
jdk_version: ['11']
jdk_impl: ['hotspot']
openjdk_testrepo: ['AdoptOpenJDK/openjdk-tests:master']

Workflow Run ID: 792786153

github-actions · 2021-04-28T13:41:48Z

@renfeiw Build(s) failed.
Workflow Run ID: 792786153

llxia · 2021-04-28T13:57:55Z

@2001asjad could up update the title to reflect the change of this PR? It should be something like: create a common makefile for D, P, Q, SQ macros

2001asjad · 2021-04-28T14:05:55Z

@2001asjad could up update the title to reflect the change of this PR? It should be something like: create a common makefile for D, P, Q, SQ macros

@llxia please take a look

renfeiw · 2021-04-28T14:12:59Z

clean.mk

@@ -14,7 +14,7 @@

 .DEFAULT_GOAL := clean

-D = /
+include common.mk


Please use full path: include $(TEST_ROOT)/TKG/common.mk and move this inclusion after ifndef TEST_ROOT block. Apply this change to all places should solve the build failure.

Please use full path: include $(TEST_ROOT)/TKG/common.mk and move this inclusion after ifndef TEST_ROOT block. Apply this change to all places should solve the build failure.

Alright. But in makeGen.mk and settings.mk the path include $(TEST_ROOT)/TKG/common.mk can be placed anywhere since it doesn't have ifndef TEST_ROOT isn't it @renfeiw ?

In this case, you need to add this block. In the future, we can move this block of code to the top level makefile, but for now let's duplicate it in makeGen.mk and settings.mk

2001asjad · 2021-04-28T17:16:43Z

@renfeiw Please take a look.
Thank You

renfeiw · 2021-04-28T18:27:13Z

run aqa --sdk_resource nightly --build_list openjdk --target sanity.openjdk --jdk_version 11 --jdk_impl hotspot --platform x86-64_linux

github-actions · 2021-04-28T18:31:56Z

@renfeiw Build(s) started with the following parameters:

sdk_resource: ['nightly']
customized_sdk_url: ['None']
archive_extension: ['.tar']
build_list: ['openjdk']
target: ['_sanity.openjdk']
platform: ['ubuntu-latest']
jdk_version: ['11']
jdk_impl: ['hotspot']
openjdk_testrepo: ['AdoptOpenJDK/openjdk-tests:master']

Workflow Run ID: 793618751

github-actions · 2021-04-28T18:38:00Z

@renfeiw Build(s) failed.
Workflow Run ID: 793618751

2001asjad · 2021-04-28T18:44:50Z

@renfeiw Build(s) failed.
Workflow Run ID: 793618751

@renfeiw it fails again. Any idea where am I going wrong?

renfeiw · 2021-04-28T19:04:31Z

You need to change this line: TEST_ROOT := $(shell pwd)$(D).. => TEST_ROOT := $(shell pwd)/..

github-actions · 2021-04-29T19:55:59Z

@llxia Build(s) successful.
Workflow Run ID: 796987209

2001asjad · 2021-04-30T06:05:46Z

I am running a grinder on windows to test it.

@renfeiw is this alright now?

llxia · 2021-04-30T14:10:35Z

run aqa --sdk_resource nightly --build_list functional --target sanity.functional.regular --jdk_version 11 --jdk_impl openj9 --platform x86-64_windows

github-actions · 2021-04-30T14:10:51Z

@llxia Build(s) started with the following parameters:

sdk_resource: ['nightly']
customized_sdk_url: ['None']
archive_extension: ['.tar']
build_list: ['functional']
target: ['_sanity.functional.regular']
platform: ['windows-latest']
jdk_version: ['11']
jdk_impl: ['openj9']
openjdk_testrepo: ['AdoptOpenJDK/openjdk-tests:master']

Workflow Run ID: 799679945

llxia · 2021-04-30T14:11:04Z

run aqa --sdk_resource nightly --build_list functional --target extended.functional.regular --jdk_version 11 --jdk_impl openj9 --platform x86-64_windows

github-actions · 2021-04-30T14:11:21Z

@llxia Build(s) started with the following parameters:

sdk_resource: ['nightly']
customized_sdk_url: ['None']
archive_extension: ['.tar']
build_list: ['functional']
target: ['_extended.functional.regular']
platform: ['windows-latest']
jdk_version: ['11']
jdk_impl: ['openj9']
openjdk_testrepo: ['AdoptOpenJDK/openjdk-tests:master']

Workflow Run ID: 799681282

github-actions · 2021-04-30T14:22:08Z

@llxia Build(s) failed.
Workflow Run ID: 799679945

github-actions · 2021-04-30T14:22:28Z

@llxia Build(s) failed.
Workflow Run ID: 799681282

renfeiw · 2021-04-30T15:05:12Z

I encountered the same issue on windows grinder.

2001asjad · 2021-04-30T16:12:41Z

I encountered the same issue on windows grinder.

@llxia @renfeiw suggestions?

llxia · 2021-04-30T17:29:15Z

https://github.com/adoptium/TKG/runs/2476330990?check_suite_focus=true

C:/hostedtoolcache/windows/jdk-11-openj9/1.0.0/x64/bin/java -cp "./bin/TestKitGen.jar:./lib/json-simple.jar" org.testKitGen.MainRunner --mode=tests --spec=win_x86-64_mxdptrs --jdkVersion=11 --impl=openj9 --vendor="adoptopenjdk" --buildList=functional --iterations=1 --testFlag= --testTarget=sanity.functional.regular --testList= --numOfMachines= --testTime= --TRSSURL= 
Error: Could not find or load main class org.testKitGen.MainRunner
Caused by: java.lang.ClassNotFoundException: org.testKitGen.MainRunner
make[1]: *** [makeGen.mk:48: autogen] Error 1
make[1]: Leaving directory '/cygdrive/d/a/TKG/TKG/openjdk-tests/TKG'
make: *** [makefile:47: _sanity.functional.regular] Error 2
Error: The process 'C:\cygwin64\bin\make.exe' failed with exit code 2

For windows, the classpath separator is ;, not :

2001asjad · 2021-04-30T17:58:16Z

https://github.com/adoptium/TKG/runs/2476330990?check_suite_focus=true

C:/hostedtoolcache/windows/jdk-11-openj9/1.0.0/x64/bin/java -cp "./bin/TestKitGen.jar:./lib/json-simple.jar" org.testKitGen.MainRunner --mode=tests --spec=win_x86-64_mxdptrs --jdkVersion=11 --impl=openj9 --vendor="adoptopenjdk" --buildList=functional --iterations=1 --testFlag= --testTarget=sanity.functional.regular --testList= --numOfMachines= --testTime= --TRSSURL= 
Error: Could not find or load main class org.testKitGen.MainRunner
Caused by: java.lang.ClassNotFoundException: org.testKitGen.MainRunner
make[1]: *** [makeGen.mk:48: autogen] Error 1
make[1]: Leaving directory '/cygdrive/d/a/TKG/TKG/openjdk-tests/TKG'
make: *** [makefile:47: _sanity.functional.regular] Error 2
Error: The process 'C:\cygwin64\bin\make.exe' failed with exit code 2

For windows, the classpath separator is ;, not :

Ok... Seeing the error message the changes are needed at makeGen.mk and makefile.mk at lines 48 and 47 respectively. (Which you mentioned above). Am I right @llxia ?

common.mk

llxia · 2021-05-03T14:20:39Z

run aqa --sdk_resource nightly --build_list functional --target sanity.functional.regular --jdk_version 11 --jdk_impl openj9 --platform x86-64_windows

github-actions · 2021-05-03T14:20:59Z

@llxia Build(s) started with the following parameters:

sdk_resource: ['nightly']
customized_sdk_url: ['None']
archive_extension: ['.tar']
build_list: ['functional']
target: ['_sanity.functional.regular']
platform: ['windows-latest']
jdk_version: ['11']
jdk_impl: ['openj9']
openjdk_testrepo: ['AdoptOpenJDK/openjdk-tests:master']

Workflow Run ID: 807083587

github-actions · 2021-05-03T15:05:53Z

@llxia Build(s) failed.
Workflow Run ID: 807083587

2001asjad · 2021-05-04T12:53:27Z

@llxia @renfeiw can you take a look?

llxia · 2021-06-08T15:30:54Z

@2001asjad Could you do some initial investigation?

2001asjad · 2021-06-08T16:48:47Z

@2001asjad Could you do some initial investigation?

Ok @llxia , like what? I'll definitely take a look then.

llxia · 2021-06-08T17:06:35Z

@2001asjad It would be nice if you could do the initial investigation on the PR build failure. Please feel free to launch run aqa or Grinder if needed.

renfeiw · 2021-08-11T16:17:55Z

Close this PR as no one is currently working on it.

Remove unnecessory macros

b0ecff6

smlambert requested a review from renfeiw April 27, 2021 17:53

renfeiw reviewed Apr 27, 2021

View reviewed changes

common.mk Show resolved Hide resolved

karianna added the bug Something isn't working label Apr 28, 2021

karianna added this to the April 2021 milestone Apr 28, 2021

renfeiw reviewed Apr 28, 2021

View reviewed changes

create a common makefile for D, P, Q, SQ macros

69fba39

2001asjad force-pushed the Asjad-issue-159 branch from 3bb21df to 69fba39 Compare April 28, 2021 17:11

create a common makefile for D, P, Q, SQ macros

15bc671

2001asjad added 5 commits April 29, 2021 02:31

create a common makefile for D, P, Q, SQ

31ec76c

Create a common makefile for D, P, Q, SQ

74665dd

Create a common makefile for D, P, Q, SQ

dd2ef36

Create a common makefile for D, P, Q, SQ

e8b7ab3

Create a common makefile for D, P, Q, SQ

3959fcf

renfeiw reviewed Apr 30, 2021

View reviewed changes

common.mk Show resolved Hide resolved

2001asjad added 3 commits May 1, 2021 23:49

Create a common makefile for D, P, Q, SQ

7243965

Create a common makefile for D, P, Q, SQ

f6c2595

Create a common makefile for D, P, Q, SQ

13a2f29

karianna modified the milestones: April 2021, May 2021 May 4, 2021

2001asjad requested a review from renfeiw May 12, 2021 04:40

smlambert removed this from the May 2021 milestone Jun 2, 2021

renfeiw closed this Aug 11, 2021

Create a common makefile for D, P, Q, SQ #188

Create a common makefile for D, P, Q, SQ #188

Conversation

2001asjad commented Apr 27, 2021

2001asjad commented Apr 27, 2021

renfeiw commented Apr 27, 2021

2001asjad commented Apr 27, 2021

2001asjad commented Apr 27, 2021

renfeiw commented Apr 28, 2021

github-actions bot commented Apr 28, 2021

github-actions bot commented Apr 28, 2021

llxia commented Apr 28, 2021

2001asjad commented Apr 28, 2021

renfeiw Apr 28, 2021

Choose a reason for hiding this comment

2001asjad Apr 28, 2021

Choose a reason for hiding this comment

renfeiw Apr 28, 2021

Choose a reason for hiding this comment

2001asjad commented Apr 28, 2021

renfeiw commented Apr 28, 2021

github-actions bot commented Apr 28, 2021

github-actions bot commented Apr 28, 2021

2001asjad commented Apr 28, 2021

renfeiw commented Apr 28, 2021

github-actions bot commented Apr 29, 2021

2001asjad commented Apr 30, 2021

llxia commented Apr 30, 2021

github-actions bot commented Apr 30, 2021

llxia commented Apr 30, 2021

github-actions bot commented Apr 30, 2021

github-actions bot commented Apr 30, 2021

github-actions bot commented Apr 30, 2021

renfeiw commented Apr 30, 2021

2001asjad commented Apr 30, 2021

llxia commented Apr 30, 2021 • edited Loading

2001asjad commented Apr 30, 2021

llxia commented May 3, 2021

github-actions bot commented May 3, 2021

github-actions bot commented May 3, 2021

2001asjad commented May 4, 2021

llxia commented Jun 8, 2021

2001asjad commented Jun 8, 2021

llxia commented Jun 8, 2021

renfeiw commented Aug 11, 2021

llxia commented Apr 30, 2021 •

edited

Loading