Set ulimit for sharedclasscache multithread tests

Signed-off-by: Simon Rushton <srushton@redhat.com>
adoptium · Feb 16, 2021 · 770419b · 770419b
1 parent eacd8c2
commit 770419b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/system/sharedClasses/playlist.xml b/system/sharedClasses/playlist.xml
@@ -28,9 +28,9 @@
 			<variation>Mode110</variation>
 			<variation>Mode610</variation>
 		</variations>
-		<command>if [[ ! $(Q)$(PLATFORM)$(Q) == *$(Q)win$(Q)* ]] ; then export original_umask_val=`umask` $(AND_IF_SUCCESS) umask 0002 $(AND_IF_SUCCESS) echo umask set to `umask`; fi; \
+		<command>if [ ! $(Q)$(PLATFORM)$(Q) == *$(Q)win$(Q)* ] ; then export original_umask_val=`umask` $(AND_IF_SUCCESS) umask 0002 $(AND_IF_SUCCESS) echo umask set to `umask`; fi; \
 	$(SYSTEMTEST_CMD_TEMPLATE) -test=SharedClassesAPI; \
-	if [[ ! $(Q)$(PLATFORM)$(Q) == *$(Q)win$(Q)* ]] ; then umask $$original_umask_val $(AND_IF_SUCCESS)  echo umask set to `umask`; fi; \
+	if [ ! $(Q)$(PLATFORM)$(Q) == *$(Q)win$(Q)* ] ; then umask $$original_umask_val $(AND_IF_SUCCESS)  echo umask set to `umask`; fi; \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>
@@ -185,7 +185,10 @@
 			<variation>Mode110</variation>
 			<variation>Mode610</variation>
 		</variations>
-		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=SharedClasses -test-args=$(Q)sharedClassMode=SCM01,sharedClassTest=MultiThread$(Q); \
+		<!-- Some platforms may have max user processes too low by default for this test
+		 - e.g. see https://github.com/AdoptOpenJDK/openjdk-infrastructure/issues/1851 -->
+		<command>test $$(echo $(Q)$(PLATFORM)$(Q) | grep $(Q)win$(Q)) $(AND_IF_SUCCESS) test -f /bin/bash $(AND_IF_SUCCESS) /bin/bash -c 'test $$(ulimit -u) -lt 2048 $(AND_IF_SUCCESS) echo Attempting to increase max user processes from `ulimit -u` to 2048 $(AND_IF_SUCCESS) ulimit -u 2048 $(AND_IF_SUCCESS) echo ulimit -u now `ulimit -u`'; \
+		$(SYSTEMTEST_CMD_TEMPLATE) -test=SharedClasses -test-args=$(Q)sharedClassMode=SCM01,sharedClassTest=MultiThread$(Q); \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>
@@ -261,7 +264,10 @@
 			<variation>Mode110</variation>
 			<variation>Mode610</variation>
 		</variations>
-		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=SharedClasses -test-args=$(Q)sharedClassMode=SCM23,sharedClassTest=MultiThread$(Q); \
+		<!-- Some platforms may have max user processes too low by default for this test
+		 - e.g. see https://github.com/AdoptOpenJDK/openjdk-infrastructure/issues/1851 -->
+		<command>test $$(echo $(Q)$(PLATFORM)$(Q) | grep $(Q)win$(Q)) $(AND_IF_SUCCESS) test -f /bin/bash $(AND_IF_SUCCESS) /bin/bash -c 'test $$(ulimit -u) -lt 2048 $(AND_IF_SUCCESS) echo Attempting to increase max user processes from `ulimit -u` to 2048 $(AND_IF_SUCCESS) ulimit -u 2048 $(AND_IF_SUCCESS) echo ulimit -u now `ulimit -u`'; \
+	$(SYSTEMTEST_CMD_TEMPLATE) -test=SharedClasses -test-args=$(Q)sharedClassMode=SCM23,sharedClassTest=MultiThread$(Q); \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>