421 JDK_ALL_TARGETS = |
421 JDK_ALL_TARGETS = |
422 |
422 |
423 # Stable othervm testruns (minus items from PROBLEM_LIST) |
423 # Stable othervm testruns (minus items from PROBLEM_LIST) |
424 # Using samevm has problems, and doesn't help performance as much as others. |
424 # Using samevm has problems, and doesn't help performance as much as others. |
425 JDK_ALL_TARGETS += jdk_awt |
425 JDK_ALL_TARGETS += jdk_awt |
426 jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt) |
426 jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \ |
|
427 javax/imageio javax/print sun/pisces) |
427 $(call RunOthervmBatch) |
428 $(call RunOthervmBatch) |
428 |
429 |
429 # Stable samevm testruns (minus items from PROBLEM_LIST) |
430 # Stable samevm testruns (minus items from PROBLEM_LIST) |
430 JDK_ALL_TARGETS += jdk_beans1 |
431 JDK_ALL_TARGETS += jdk_beans1 |
431 jdk_beans1: $(call TestDirs, \ |
432 jdk_beans1: $(call TestDirs, \ |
484 $(call RunSamevmBatch) |
485 $(call RunSamevmBatch) |
485 |
486 |
486 # Stable samevm testruns (minus items from PROBLEM_LIST) |
487 # Stable samevm testruns (minus items from PROBLEM_LIST) |
487 JDK_ALL_TARGETS += jdk_misc |
488 JDK_ALL_TARGETS += jdk_misc |
488 jdk_misc: $(call TestDirs, \ |
489 jdk_misc: $(call TestDirs, \ |
489 demo javax/imageio javax/naming javax/print javax/script \ |
490 demo/jvmti demo/zipfs javax/naming javax/script \ |
490 javax/smartcardio javax/sound com/sun/java com/sun/jndi \ |
491 javax/smartcardio com/sun/jndi com/sun/xml sun/misc) |
491 com/sun/org com/sun/xml sun/misc sun/pisces) |
|
492 $(call RunSamevmBatch) |
492 $(call RunSamevmBatch) |
493 |
493 |
494 # Stable samevm testruns (minus items from PROBLEM_LIST) |
494 # Stable samevm testruns (minus items from PROBLEM_LIST) |
495 JDK_ALL_TARGETS += jdk_net |
495 JDK_ALL_TARGETS += jdk_net |
496 jdk_net: $(call TestDirs, com/sun/net java/net sun/net) |
496 jdk_net: $(call TestDirs, com/sun/net java/net sun/net) |
530 # Stable samevm testruns (minus items from PROBLEM_LIST) |
530 # Stable samevm testruns (minus items from PROBLEM_LIST) |
531 JDK_ALL_TARGETS += jdk_security1 |
531 JDK_ALL_TARGETS += jdk_security1 |
532 jdk_security1: $(call TestDirs, java/security) |
532 jdk_security1: $(call TestDirs, java/security) |
533 $(call RunSamevmBatch) |
533 $(call RunSamevmBatch) |
534 |
534 |
535 # Stable othervm testruns (minus items from PROBLEM_LIST) |
535 # Stable samevm testruns (minus items from PROBLEM_LIST) |
536 # Using samevm has serious problems with these tests |
|
537 JDK_ALL_TARGETS += jdk_security2 |
536 JDK_ALL_TARGETS += jdk_security2 |
538 jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto) |
537 jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto) |
539 $(call RunSamevmBatch) |
538 $(call RunSamevmBatch) |
540 |
539 |
541 # Stable othervm testruns (minus items from PROBLEM_LIST) |
540 # Stable samevm testruns (minus items from PROBLEM_LIST) |
542 # Using samevm has serious problems with these tests |
|
543 JDK_ALL_TARGETS += jdk_security3 |
541 JDK_ALL_TARGETS += jdk_security3 |
544 jdk_security3: $(call TestDirs, com/sun/security lib/security \ |
542 jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \ |
545 javax/security sun/security) |
543 sun/security com/sun/org/apache/xml/internal/security) |
546 $(call SharedLibraryPermissions,sun/security) |
544 $(call SharedLibraryPermissions,sun/security) |
547 $(call RunSamevmBatch) |
545 $(call RunSamevmBatch) |
548 |
546 |
549 # All security tests |
547 # All security tests |
550 jdk_security: jdk_security1 jdk_security2 jdk_security3 |
548 jdk_security: jdk_security1 jdk_security2 jdk_security3 |
551 @$(SummaryInfo) |
549 @$(SummaryInfo) |
552 |
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 |
553 # Stable othervm testruns (minus items from PROBLEM_LIST) |
556 # Stable othervm testruns (minus items from PROBLEM_LIST) |
554 # Using samevm has problems, and doesn't help performance as much as others. |
557 # Using samevm has problems, and doesn't help performance as much as others. |
555 JDK_ALL_TARGETS += jdk_swing |
558 JDK_ALL_TARGETS += jdk_swing |
556 jdk_swing: $(call TestDirs, javax/swing sun/java2d) |
559 jdk_swing: $(call TestDirs, javax/swing sun/java2d \ |
|
560 demo/jfc com/sun/java/swing) |
557 $(call RunOthervmBatch) |
561 $(call RunOthervmBatch) |
558 |
562 |
559 # Stable samevm testruns (minus items from PROBLEM_LIST) |
563 # Stable samevm testruns (minus items from PROBLEM_LIST) |
560 JDK_ALL_TARGETS += jdk_text |
564 JDK_ALL_TARGETS += jdk_text |
561 jdk_text: $(call TestDirs, java/text sun/text) |
565 jdk_text: $(call TestDirs, java/text sun/text) |
800 endif |
804 endif |
801 |
805 |
802 # The jtjck.jar utility to use to run the tests |
806 # The jtjck.jar utility to use to run the tests |
803 JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar |
807 JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar |
804 JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m |
808 JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m |
805 JTJCK_OPTIONS = -headless -v |
809 JTJCK_OPTIONS = -headless -v |
806 |
810 |
807 # Default tests to run |
811 # Default tests to run |
808 ifndef JCK_COMPILER_TESTS |
812 ifndef JCK_COMPILER_TESTS |
809 JCK_COMPILER_TESTS = |
813 JCK_COMPILER_TESTS = |
810 endif |
814 endif |
811 ifndef JCK_RUNTIME_TESTS |
815 ifndef JCK_RUNTIME_TESTS |
812 JCK_RUNTIME_TESTS = |
816 JCK_RUNTIME_TESTS = |
813 endif |
817 endif |
814 ifndef JCK_DEVTOOLS_TESTS |
818 ifndef JCK_DEVTOOLS_TESTS |
815 JCK_DEVTOOLS_TESTS = |
819 JCK_DEVTOOLS_TESTS = |
816 endif |
820 endif |
817 |
821 |
818 # Generic rule used to run jck tests |
822 # Generic rule used to run jck tests |
819 _generic_jck_tests: prep $(PRODUCT_HOME) $(EXCLUDELIST) |
823 _generic_jck_tests: prep $(PRODUCT_HOME) $(EXCLUDELIST) |
820 @$(EXPAND) $(EXCLUDELIST) \ |
824 @$(EXPAND) $(EXCLUDELIST) \ |
836 JCK_HOME=$(JCK7COMPILER_HOME) \ |
840 JCK_HOME=$(JCK7COMPILER_HOME) \ |
837 TESTDIRS="$(JCK_COMPILER_TESTS)" \ |
841 TESTDIRS="$(JCK_COMPILER_TESTS)" \ |
838 _generic_jck_tests |
842 _generic_jck_tests |
839 |
843 |
840 # JCK7 runtime tests |
844 # JCK7 runtime tests |
841 jck7runtime: |
845 jck7runtime: |
842 $(MAKE) UNIQUE_DIR=$@ \ |
846 $(MAKE) UNIQUE_DIR=$@ \ |
843 JCK_HOME=$(JCK7RUNTIME_HOME) \ |
847 JCK_HOME=$(JCK7RUNTIME_HOME) \ |
844 TESTDIRS="$(JCK_RUNTIME_TESTS)" \ |
848 TESTDIRS="$(JCK_RUNTIME_TESTS)" \ |
845 _generic_jck_tests |
849 _generic_jck_tests |
846 |
850 |
847 # JCK7 devtools tests |
851 # JCK7 devtools tests |
848 jck7devtools: |
852 jck7devtools: |
849 $(MAKE) UNIQUE_DIR=$@ \ |
853 $(MAKE) UNIQUE_DIR=$@ \ |
850 JCK_HOME=$(JCK7DEVTOOLS_HOME) \ |
854 JCK_HOME=$(JCK7DEVTOOLS_HOME) \ |
851 TESTDIRS="$(JCK_DEVTOOLS_TESTS)" \ |
855 TESTDIRS="$(JCK_DEVTOOLS_TESTS)" \ |
852 _generic_jck_tests |
856 _generic_jck_tests |
853 |
857 |