406 $(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_SAMEVM=true UNIQUE_DIR=$@ jtreg_tests
407 endef
408 define RunOthervmBatch
409 $(ECHO) "Running tests in othervm mode: $?"
410 $(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
411 endef
412 define SummaryInfo
413 $(ECHO) "########################################################"
414 $(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
415 $(ECHO) "########################################################"
416 endef
417
418 # ------------------------------------------------------------------
419
420 # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
421 JDK_ALL_TARGETS =
422
423 # Stable othervm testruns (minus items from PROBLEM_LIST)
424 # Using samevm has problems, and doesn't help performance as much as others.
425 JDK_ALL_TARGETS += jdk_awt
426 jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt)
427 $(call RunOthervmBatch)
428
429 # Stable samevm testruns (minus items from PROBLEM_LIST)
430 JDK_ALL_TARGETS += jdk_beans1
431 jdk_beans1: $(call TestDirs, \
432 java/beans/beancontext java/beans/PropertyChangeSupport \
433 java/beans/Introspector java/beans/Performance \
434 java/beans/VetoableChangeSupport java/beans/Statement)
435 $(call RunSamevmBatch)
436
437 # Stable othervm testruns (minus items from PROBLEM_LIST)
438 # Using samevm has serious problems with these tests
439 JDK_ALL_TARGETS += jdk_beans2
440 jdk_beans2: $(call TestDirs, \
441 java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \
442 java/beans/PropertyEditor)
443 $(call RunOthervmBatch)
444
445 # Stable othervm testruns (minus items from PROBLEM_LIST)
446 # Using samevm has serious problems with these tests
469 $(call RunOthervmBatch)
470
471 # Stable othervm testruns (minus items from PROBLEM_LIST)
472 # Using samevm has serious problems with these tests
473 JDK_ALL_TARGETS += jdk_management2
474 jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management)
475 $(call RunOthervmBatch)
476
477 # All management tests
478 jdk_management: jdk_management1 jdk_management2
479 @$(SummaryInfo)
480
481 # Stable samevm testruns (minus items from PROBLEM_LIST)
482 JDK_ALL_TARGETS += jdk_math
483 jdk_math: $(call TestDirs, java/math)
484 $(call RunSamevmBatch)
485
486 # Stable samevm testruns (minus items from PROBLEM_LIST)
487 JDK_ALL_TARGETS += jdk_misc
488 jdk_misc: $(call TestDirs, \
489 demo javax/imageio javax/naming javax/print javax/script \
490 javax/smartcardio javax/sound com/sun/java com/sun/jndi \
491 com/sun/org com/sun/xml sun/misc sun/pisces)
492 $(call RunSamevmBatch)
493
494 # Stable samevm testruns (minus items from PROBLEM_LIST)
495 JDK_ALL_TARGETS += jdk_net
496 jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
497 $(call RunSamevmBatch)
498
499 # Stable samevm testruns (minus items from PROBLEM_LIST)
500 JDK_ALL_TARGETS += jdk_nio1
501 jdk_nio1: $(call TestDirs, java/nio/file)
502 $(call RunSamevmBatch)
503
504 # Stable samevm testruns (minus items from PROBLEM_LIST)
505 JDK_ALL_TARGETS += jdk_nio2
506 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
507 java/nio/channels java/nio/MappedByteBuffer)
508 $(call SharedLibraryPermissions,java/nio/channels)
509 $(call RunSamevmBatch)
510
511 # Stable samevm testruns (minus items from PROBLEM_LIST)
515
516 # All nio tests
517 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
518 @$(SummaryInfo)
519
520 # Stable samevm testruns (minus items from PROBLEM_LIST)
521 jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
522 $(call RunSamevmBatch)
523
524 # Stable othervm testruns (minus items from PROBLEM_LIST)
525 # Using samevm has serious problems with these tests
526 JDK_ALL_TARGETS += jdk_rmi
527 jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
528 $(call RunOthervmBatch)
529
530 # Stable samevm testruns (minus items from PROBLEM_LIST)
531 JDK_ALL_TARGETS += jdk_security1
532 jdk_security1: $(call TestDirs, java/security)
533 $(call RunSamevmBatch)
534
535 # Stable othervm testruns (minus items from PROBLEM_LIST)
536 # Using samevm has serious problems with these tests
537 JDK_ALL_TARGETS += jdk_security2
538 jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto)
539 $(call RunSamevmBatch)
540
541 # Stable othervm testruns (minus items from PROBLEM_LIST)
542 # Using samevm has serious problems with these tests
543 JDK_ALL_TARGETS += jdk_security3
544 jdk_security3: $(call TestDirs, com/sun/security lib/security \
545 javax/security sun/security)
546 $(call SharedLibraryPermissions,sun/security)
547 $(call RunSamevmBatch)
548
549 # All security tests
550 jdk_security: jdk_security1 jdk_security2 jdk_security3
551 @$(SummaryInfo)
552
553 # Stable othervm testruns (minus items from PROBLEM_LIST)
554 # Using samevm has problems, and doesn't help performance as much as others.
555 JDK_ALL_TARGETS += jdk_swing
556 jdk_swing: $(call TestDirs, javax/swing sun/java2d)
557 $(call RunOthervmBatch)
558
559 # Stable samevm testruns (minus items from PROBLEM_LIST)
560 JDK_ALL_TARGETS += jdk_text
561 jdk_text: $(call TestDirs, java/text sun/text)
562 $(call RunSamevmBatch)
563
564 # Stable samevm testruns (minus items from PROBLEM_LIST)
565 JDK_ALL_TARGETS += jdk_tools1
566 jdk_tools1: $(call TestDirs, com/sun/jdi)
567 $(call RunSamevmBatch)
568
569 # Stable othervm testruns (minus items from PROBLEM_LIST)
570 # Using samevm has serious problems with these tests
571 JDK_ALL_TARGETS += jdk_tools2
572 jdk_tools2: $(call TestDirs, \
573 com/sun/tools sun/jvmstat sun/tools tools vm \
574 com/sun/servicetag com/sun/tracing)
575 $(call SharedLibraryPermissions,tools/launcher)
576 $(call RunSamevmBatch)
|
406 $(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_SAMEVM=true UNIQUE_DIR=$@ jtreg_tests
407 endef
408 define RunOthervmBatch
409 $(ECHO) "Running tests in othervm mode: $?"
410 $(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
411 endef
412 define SummaryInfo
413 $(ECHO) "########################################################"
414 $(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
415 $(ECHO) "########################################################"
416 endef
417
418 # ------------------------------------------------------------------
419
420 # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
421 JDK_ALL_TARGETS =
422
423 # Stable othervm testruns (minus items from PROBLEM_LIST)
424 # Using samevm has problems, and doesn't help performance as much as others.
425 JDK_ALL_TARGETS += jdk_awt
426 jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \
427 javax/imageio javax/print sun/pisces)
428 $(call RunOthervmBatch)
429
430 # Stable samevm testruns (minus items from PROBLEM_LIST)
431 JDK_ALL_TARGETS += jdk_beans1
432 jdk_beans1: $(call TestDirs, \
433 java/beans/beancontext java/beans/PropertyChangeSupport \
434 java/beans/Introspector java/beans/Performance \
435 java/beans/VetoableChangeSupport java/beans/Statement)
436 $(call RunSamevmBatch)
437
438 # Stable othervm testruns (minus items from PROBLEM_LIST)
439 # Using samevm has serious problems with these tests
440 JDK_ALL_TARGETS += jdk_beans2
441 jdk_beans2: $(call TestDirs, \
442 java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \
443 java/beans/PropertyEditor)
444 $(call RunOthervmBatch)
445
446 # Stable othervm testruns (minus items from PROBLEM_LIST)
447 # Using samevm has serious problems with these tests
470 $(call RunOthervmBatch)
471
472 # Stable othervm testruns (minus items from PROBLEM_LIST)
473 # Using samevm has serious problems with these tests
474 JDK_ALL_TARGETS += jdk_management2
475 jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management)
476 $(call RunOthervmBatch)
477
478 # All management tests
479 jdk_management: jdk_management1 jdk_management2
480 @$(SummaryInfo)
481
482 # Stable samevm testruns (minus items from PROBLEM_LIST)
483 JDK_ALL_TARGETS += jdk_math
484 jdk_math: $(call TestDirs, java/math)
485 $(call RunSamevmBatch)
486
487 # Stable samevm testruns (minus items from PROBLEM_LIST)
488 JDK_ALL_TARGETS += jdk_misc
489 jdk_misc: $(call TestDirs, \
490 demo/jvmti demo/zipfs javax/naming javax/script \
491 javax/smartcardio com/sun/jndi com/sun/xml sun/misc)
492 $(call RunSamevmBatch)
493
494 # Stable samevm testruns (minus items from PROBLEM_LIST)
495 JDK_ALL_TARGETS += jdk_net
496 jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
497 $(call RunSamevmBatch)
498
499 # Stable samevm testruns (minus items from PROBLEM_LIST)
500 JDK_ALL_TARGETS += jdk_nio1
501 jdk_nio1: $(call TestDirs, java/nio/file)
502 $(call RunSamevmBatch)
503
504 # Stable samevm testruns (minus items from PROBLEM_LIST)
505 JDK_ALL_TARGETS += jdk_nio2
506 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
507 java/nio/channels java/nio/MappedByteBuffer)
508 $(call SharedLibraryPermissions,java/nio/channels)
509 $(call RunSamevmBatch)
510
511 # Stable samevm testruns (minus items from PROBLEM_LIST)
515
516 # All nio tests
517 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
518 @$(SummaryInfo)
519
520 # Stable samevm testruns (minus items from PROBLEM_LIST)
521 jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
522 $(call RunSamevmBatch)
523
524 # Stable othervm testruns (minus items from PROBLEM_LIST)
525 # Using samevm has serious problems with these tests
526 JDK_ALL_TARGETS += jdk_rmi
527 jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
528 $(call RunOthervmBatch)
529
530 # Stable samevm testruns (minus items from PROBLEM_LIST)
531 JDK_ALL_TARGETS += jdk_security1
532 jdk_security1: $(call TestDirs, java/security)
533 $(call RunSamevmBatch)
534
535 # Stable samevm testruns (minus items from PROBLEM_LIST)
536 JDK_ALL_TARGETS += jdk_security2
537 jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto)
538 $(call RunSamevmBatch)
539
540 # Stable samevm testruns (minus items from PROBLEM_LIST)
541 JDK_ALL_TARGETS += jdk_security3
542 jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \
543 sun/security com/sun/org/apache/xml/internal/security)
544 $(call SharedLibraryPermissions,sun/security)
545 $(call RunSamevmBatch)
546
547 # All security tests
548 jdk_security: jdk_security1 jdk_security2 jdk_security3
549 @$(SummaryInfo)
550
551 # Stable samevm testruns (minus items from PROBLEM_LIST)
552 JDK_ALL_TARGETS += jdk_sound
553 jdk_sound: $(call TestDirs, javax/sound)
554 $(call RunSamevmBatch)
555
556 # Stable othervm testruns (minus items from PROBLEM_LIST)
557 # Using samevm has problems, and doesn't help performance as much as others.
558 JDK_ALL_TARGETS += jdk_swing
559 jdk_swing: $(call TestDirs, javax/swing sun/java2d \
560 demo/jfc com/sun/java/swing)
561 $(call RunOthervmBatch)
562
563 # Stable samevm testruns (minus items from PROBLEM_LIST)
564 JDK_ALL_TARGETS += jdk_text
565 jdk_text: $(call TestDirs, java/text sun/text)
566 $(call RunSamevmBatch)
567
568 # Stable samevm testruns (minus items from PROBLEM_LIST)
569 JDK_ALL_TARGETS += jdk_tools1
570 jdk_tools1: $(call TestDirs, com/sun/jdi)
571 $(call RunSamevmBatch)
572
573 # Stable othervm testruns (minus items from PROBLEM_LIST)
574 # Using samevm has serious problems with these tests
575 JDK_ALL_TARGETS += jdk_tools2
576 jdk_tools2: $(call TestDirs, \
577 com/sun/tools sun/jvmstat sun/tools tools vm \
578 com/sun/servicetag com/sun/tracing)
579 $(call SharedLibraryPermissions,tools/launcher)
580 $(call RunSamevmBatch)
|