Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getPid failure in Windows #2357

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Conversation

Ailloviee
Copy link
Contributor

Revert changes made previously on #1638

Added test case in getPidTest.pl for getting pid in Windows.

Signed-off-by: Charles_Zheng Juntian.Zheng@ibm.com

@@ -23,14 +23,14 @@
-->

<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../TestConfig/playlist.xsd">
<include>path.mk</include>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we make this file name more generic in case we need to add other settings into it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe change it to variables.mk?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, that's works. Thanks.

@llxia
Copy link
Contributor

llxia commented Jul 9, 2018

Jenkins test sanity win jdk10

# [2] http://openjdk.java.net/legal/assembly-exception.html
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add ############################################################################## at the end of license

@Ailloviee Ailloviee force-pushed the getPidFix_v4 branch 4 times, most recently from 649fcbd to 7a074c4 Compare July 16, 2018 16:29
@Ailloviee Ailloviee force-pushed the getPidFix_v4 branch 4 times, most recently from 4fbd52d to e94b032 Compare July 18, 2018 20:31
-explainExcludes -xids all,$(PLATFORM),$(VARIATION) -xlist $(Q)$(TEST_RESROOT)$(D)exclude.xml$(Q) -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -DTESTDIR=$(Q)$(JVM_TEST_ROOT)$(GETPID_PATH)functional$(GETPID_PATH)cmdLineTests$(GETPID_PATH)runtimemxbeanTests$(Q) -DRESJAR=$(GETPID_CMDLINETESTER_RESJAR) -DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DTESTSJARPATH=$(Q)$(JVM_TEST_ROOT)$(GETPID_PATH)functional$(GETPID_PATH)cmdLineTests$(GETPID_PATH)runtimemxbeanTests$(GETPID_PATH)runtimemxbeanTests.jar$(Q) -jar $(GETPID_CMDLINETESTER_JAR) -config $(Q)$(JVM_TEST_ROOT)$(GETPID_PATH)functional$(GETPID_PATH)cmdLineTests$(GETPID_PATH)runtimemxbeanTests$(GETPID_PATH)getPidTest.xml$(Q) -explainExcludes -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • remove -DRESJAR=$(GETPID_CMDLINETESTER_RESJAR) in playlist.xml
  • remove GETPID_CMDLINETESTER_RESJAR in variables.mk
  • can we name GETPID_PATH some more generic?
  • make the following $(JVM_TEST_ROOT)$(GETPID_PATH)functional$(GETPID_PATH)cmdLineTests$(GETPID_PATH)runtimemxbeanTests$(GETPID_PATH) to be a variable in mk

Revert changes made previously on eclipse-openj9#1638

Added test case in getPidTest.pl for getting pid in Windows.

[ci skip]

Signed-off-by: Charles_Zheng <Juntian.Zheng@ibm.com>
@llxia
Copy link
Contributor

llxia commented Jul 19, 2018

Jenkins test sanity win jdk10

@llxia
Copy link
Contributor

llxia commented Jul 19, 2018

Jenkins test sanity xlinux jdk10

@llxia llxia merged commit b429816 into eclipse-openj9:master Jul 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants