232 x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)") |
235 x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)") |
233 endif |
236 endif |
234 endif |
237 endif |
235 endif |
238 endif |
236 |
239 |
|
240 # Temp file to hold list of shared library files possibly needing execute |
|
241 # permissions at runtime. |
|
242 SHARED_LIBRARY_LIST=$(ABS_TEST_OUTPUT_DIR)/shared_libraries.txt |
|
243 |
|
244 # Macro that may change execute permissions on library files and check for them. |
|
245 # Files in repositories should not really have execute permissions, however |
|
246 # windows dll files require execute permission. Adding execute permission |
|
247 # may happen automatically on windows when using certain versions of mercurial |
|
248 # but it cannot be guaranteed. And blindly adding execute permission might |
|
249 # be seen as a mercurial 'change', so we avoid adding execute permission to |
|
250 # repository files. Testing from a plain source tree may need the chmod a+x. |
|
251 # Used on select directories. |
|
252 define CheckLibraryExecutePermissions # dir |
|
253 $(MKDIR) -p `$(DIRNAME) $(SHARED_LIBRARY_LIST)` |
|
254 $(RM) $(SHARED_LIBRARY_LIST) |
|
255 $(FIND) $1 -name \*.dll -o -name \*.DLL -o -name \*.so > $(SHARED_LIBRARY_LIST) |
|
256 if [ -s $(SHARED_LIBRARY_LIST) -a ! -d $(TEST_ROOT)/../.hg ] ; then \ |
|
257 $(ECHO) "$(CHMOD) a+x `$(CAT) $(SHARED_LIBRARY_LIST)`"; \ |
|
258 $(CHMOD) a+x `$(CAT) $(SHARED_LIBRARY_LIST)`; \ |
|
259 fi |
|
260 if [ -s $(SHARED_LIBRARY_LIST) ] ; then \ |
|
261 for i in `$(CAT) $(SHARED_LIBRARY_LIST)` ; do \ |
|
262 if [ ! -x $${i} ] ; then \ |
|
263 $(ECHO) "WARNING: File does not have execute permission: $${i}"; \ |
|
264 fi; \ |
|
265 done; \ |
|
266 fi |
|
267 endef |
|
268 |
237 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
269 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
238 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip |
270 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip |
239 ifdef JPRT_ARCHIVE_BUNDLE |
271 ifdef JPRT_ARCHIVE_BUNDLE |
240 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
272 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
241 endif |
273 endif |
242 |
274 |
243 # How to create the test bundle (pass or fail, we want to create this) |
275 # How to create the test bundle (pass or fail, we want to create this) |
244 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. |
276 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. |
245 ZIP_UP_RESULTS = ( $(MKDIR) -p `dirname $(ARCHIVE_BUNDLE)` \ |
277 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ |
246 && $(CD) $(ABS_TEST_OUTPUT_DIR) \ |
278 && $(CD) $(ABS_TEST_OUTPUT_DIR) \ |
247 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) |
279 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) |
248 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport/text/summary.txt |
280 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport/text/summary.txt |
249 STATS_TXT_NAME = Stats.txt |
281 STATS_TXT_NAME = Stats.txt |
250 STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME) |
282 STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME) |
481 # Stable othervm testruns (minus items from PROBLEM_LIST) |
513 # Stable othervm testruns (minus items from PROBLEM_LIST) |
482 # Using samevm has serious problems with these tests |
514 # Using samevm has serious problems with these tests |
483 JDK_ALL_TARGETS += jdk_nio2 |
515 JDK_ALL_TARGETS += jdk_nio2 |
484 jdk_nio2: java/nio/Buffer java/nio/ByteOrder \ |
516 jdk_nio2: java/nio/Buffer java/nio/ByteOrder \ |
485 java/nio/channels java/nio/BufferPoolMXBean java/nio/MappedByteBuffer |
517 java/nio/channels java/nio/BufferPoolMXBean java/nio/MappedByteBuffer |
|
518 $(call CheckLibraryExecutePermissions,java/nio/channels) |
486 $(call RunOthervmBatch) |
519 $(call RunOthervmBatch) |
487 |
520 |
488 # Stable othervm testruns (minus items from PROBLEM_LIST) |
521 # Stable othervm testruns (minus items from PROBLEM_LIST) |
489 # Using samevm has serious problems with these tests |
522 # Using samevm has serious problems with these tests |
490 JDK_ALL_TARGETS += jdk_nio3 |
523 JDK_ALL_TARGETS += jdk_nio3 |
514 |
547 |
515 # Stable othervm testruns (minus items from PROBLEM_LIST) |
548 # Stable othervm testruns (minus items from PROBLEM_LIST) |
516 # Using samevm has serious problems with these tests |
549 # Using samevm has serious problems with these tests |
517 JDK_ALL_TARGETS += jdk_security3 |
550 JDK_ALL_TARGETS += jdk_security3 |
518 jdk_security3: com/sun/security lib/security javax/security sun/security |
551 jdk_security3: com/sun/security lib/security javax/security sun/security |
|
552 $(call CheckLibraryExecutePermissions,sun/security) |
519 $(call RunOthervmBatch) |
553 $(call RunOthervmBatch) |
520 |
554 |
521 # All security tests |
555 # All security tests |
522 jdk_security: jdk_security1 jdk_security2 jdk_security3 |
556 jdk_security: jdk_security1 jdk_security2 jdk_security3 |
523 @$(SummaryInfo) |
557 @$(SummaryInfo) |
540 |
574 |
541 # Stable othervm testruns (minus items from PROBLEM_LIST) |
575 # Stable othervm testruns (minus items from PROBLEM_LIST) |
542 # Using samevm has serious problems with these tests |
576 # Using samevm has serious problems with these tests |
543 JDK_ALL_TARGETS += jdk_tools2 |
577 JDK_ALL_TARGETS += jdk_tools2 |
544 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing |
578 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing |
|
579 $(call CheckLibraryExecutePermissions,tools/launcher) |
545 $(call RunOthervmBatch) |
580 $(call RunOthervmBatch) |
546 |
581 |
547 # All tools tests |
582 # All tools tests |
548 jdk_tools: jdk_tools1 jdk_tools2 |
583 jdk_tools: jdk_tools1 jdk_tools2 |
549 @$(SummaryInfo) |
584 @$(SummaryInfo) |