jdk/test/Makefile
changeset 8769 728aa3db9869
parent 5970 d4e98bbfb0be
child 9035 1255eb81cc2f
child 8992 6a3062c1416f
equal deleted inserted replaced
8767:3c56f4183741 8769:728aa3db9869
   397 define TestDirs
   397 define TestDirs
   398 $(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i}))
   398 $(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i}))
   399 endef
   399 endef
   400 # Running batches of tests with or without samevm
   400 # Running batches of tests with or without samevm
   401 define RunSamevmBatch
   401 define RunSamevmBatch
   402 $(ECHO) "Running tests in samevm mode: $(call TestDirs, $?)"
   402 $(ECHO) "Running tests in samevm mode: $?"
   403 $(MAKE) TESTDIRS="$(call TestDirs, $?)" USE_JTREG_SAMEVM=true  UNIQUE_DIR=$@ jtreg_tests
   403 $(MAKE) TESTDIRS="$?" USE_JTREG_SAMEVM=true  UNIQUE_DIR=$@ jtreg_tests
   404 endef
   404 endef
   405 define RunOthervmBatch
   405 define RunOthervmBatch
   406 $(ECHO) "Running tests in othervm mode: $(call TestDirs, $?)"
   406 $(ECHO) "Running tests in othervm mode: $?"
   407 $(MAKE) TESTDIRS="$(call TestDirs, $?)" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
   407 $(MAKE) TESTDIRS="$?" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
   408 endef
   408 endef
   409 define SummaryInfo
   409 define SummaryInfo
   410 $(ECHO) "########################################################"
   410 $(ECHO) "########################################################"
   411 $(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
   411 $(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
   412 $(ECHO) "########################################################"
   412 $(ECHO) "########################################################"
   418 JDK_ALL_TARGETS =
   418 JDK_ALL_TARGETS =
   419 
   419 
   420 # Stable othervm testruns (minus items from PROBLEM_LIST)
   420 # Stable othervm testruns (minus items from PROBLEM_LIST)
   421 #   Using samevm has problems, and doesn't help performance as much as others.
   421 #   Using samevm has problems, and doesn't help performance as much as others.
   422 JDK_ALL_TARGETS += jdk_awt
   422 JDK_ALL_TARGETS += jdk_awt
   423 jdk_awt: com/sun/awt java/awt sun/awt
   423 jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt)
   424 	$(call RunOthervmBatch)
   424 	$(call RunOthervmBatch)
   425 
   425 
   426 # Stable samevm testruns (minus items from PROBLEM_LIST)
   426 # Stable samevm testruns (minus items from PROBLEM_LIST)
   427 JDK_ALL_TARGETS += jdk_beans1
   427 JDK_ALL_TARGETS += jdk_beans1
   428 jdk_beans1: java/beans/beancontext java/beans/PropertyChangeSupport \
   428 jdk_beans1: $(call TestDirs, \
       
   429             java/beans/beancontext java/beans/PropertyChangeSupport \
   429             java/beans/Introspector java/beans/Performance \
   430             java/beans/Introspector java/beans/Performance \
   430             java/beans/VetoableChangeSupport java/beans/Statement
   431             java/beans/VetoableChangeSupport java/beans/Statement)
   431 	$(call RunSamevmBatch)
   432 	$(call RunSamevmBatch)
   432 
   433 
   433 # Stable othervm testruns (minus items from PROBLEM_LIST)
   434 # Stable othervm testruns (minus items from PROBLEM_LIST)
   434 #   Using samevm has serious problems with these tests
   435 #   Using samevm has serious problems with these tests
   435 JDK_ALL_TARGETS += jdk_beans2
   436 JDK_ALL_TARGETS += jdk_beans2
   436 jdk_beans2: java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \
   437 jdk_beans2: $(call TestDirs, \
   437             java/beans/PropertyEditor
   438             java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \
       
   439             java/beans/PropertyEditor)
   438 	$(call RunOthervmBatch)
   440 	$(call RunOthervmBatch)
   439 
   441 
   440 # Stable othervm testruns (minus items from PROBLEM_LIST)
   442 # Stable othervm testruns (minus items from PROBLEM_LIST)
   441 #   Using samevm has serious problems with these tests
   443 #   Using samevm has serious problems with these tests
   442 JDK_ALL_TARGETS += jdk_beans3
   444 JDK_ALL_TARGETS += jdk_beans3
   443 jdk_beans3: java/beans/XMLEncoder
   445 jdk_beans3: $(call TestDirs, java/beans/XMLEncoder)
   444 	$(call RunOthervmBatch)
   446 	$(call RunOthervmBatch)
   445 
   447 
   446 # All beans tests
   448 # All beans tests
   447 jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
   449 jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
   448 	@$(SummaryInfo)
   450 	@$(SummaryInfo)
   449 
   451 
   450 # Stable samevm testruns (minus items from PROBLEM_LIST)
   452 # Stable samevm testruns (minus items from PROBLEM_LIST)
   451 JDK_ALL_TARGETS += jdk_io
   453 JDK_ALL_TARGETS += jdk_io
   452 jdk_io: java/io
   454 jdk_io: $(call TestDirs, java/io)
   453 	$(call RunSamevmBatch)
   455 	$(call RunSamevmBatch)
   454 
   456 
   455 # Stable samevm testruns (minus items from PROBLEM_LIST)
   457 # Stable samevm testruns (minus items from PROBLEM_LIST)
   456 JDK_ALL_TARGETS += jdk_lang
   458 JDK_ALL_TARGETS += jdk_lang
   457 jdk_lang: java/lang
   459 jdk_lang: $(call TestDirs, java/lang)
   458 	$(call RunSamevmBatch)
   460 	$(call RunSamevmBatch)
   459 
   461 
   460 # Stable othervm testruns (minus items from PROBLEM_LIST)
   462 # Stable othervm testruns (minus items from PROBLEM_LIST)
   461 #   Using samevm has serious problems with these tests
   463 #   Using samevm has serious problems with these tests
   462 JDK_ALL_TARGETS += jdk_management1
   464 JDK_ALL_TARGETS += jdk_management1
   463 jdk_management1: javax/management
   465 jdk_management1: $(call TestDirs, javax/management)
   464 	$(call RunOthervmBatch)
   466 	$(call RunOthervmBatch)
   465 
   467 
   466 # Stable othervm testruns (minus items from PROBLEM_LIST)
   468 # Stable othervm testruns (minus items from PROBLEM_LIST)
   467 #   Using samevm has serious problems with these tests
   469 #   Using samevm has serious problems with these tests
   468 JDK_ALL_TARGETS += jdk_management2
   470 JDK_ALL_TARGETS += jdk_management2
   469 jdk_management2: com/sun/jmx com/sun/management sun/management
   471 jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management)
   470 	$(call RunOthervmBatch)
   472 	$(call RunOthervmBatch)
   471 
   473 
   472 # All management tests
   474 # All management tests
   473 jdk_management: jdk_management1 jdk_management2
   475 jdk_management: jdk_management1 jdk_management2
   474 	@$(SummaryInfo)
   476 	@$(SummaryInfo)
   475 
   477 
   476 # Stable samevm testruns (minus items from PROBLEM_LIST)
   478 # Stable samevm testruns (minus items from PROBLEM_LIST)
   477 JDK_ALL_TARGETS += jdk_math
   479 JDK_ALL_TARGETS += jdk_math
   478 jdk_math: java/math
   480 jdk_math: $(call TestDirs, java/math)
   479 	$(call RunSamevmBatch)
   481 	$(call RunSamevmBatch)
   480 
   482 
   481 # Stable samevm testruns (minus items from PROBLEM_LIST)
   483 # Stable samevm testruns (minus items from PROBLEM_LIST)
   482 JDK_ALL_TARGETS += jdk_misc
   484 JDK_ALL_TARGETS += jdk_misc
   483 jdk_misc: demo javax/imageio javax/naming javax/print javax/script \
   485 jdk_misc: $(call TestDirs, \
       
   486           demo javax/imageio javax/naming javax/print javax/script \
   484           javax/smartcardio javax/sound com/sun/java com/sun/jndi \
   487           javax/smartcardio javax/sound com/sun/java com/sun/jndi \
   485 	  com/sun/org sun/misc sun/pisces
   488 	  com/sun/org com/sun/xml sun/misc sun/pisces)
   486 	$(call RunSamevmBatch)
   489 	$(call RunSamevmBatch)
   487 
   490 
   488 # Stable samevm testruns (minus items from PROBLEM_LIST)
   491 # Stable samevm testruns (minus items from PROBLEM_LIST)
   489 JDK_ALL_TARGETS += jdk_net
   492 JDK_ALL_TARGETS += jdk_net
   490 jdk_net: com/sun/net java/net sun/net
   493 jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
   491 	$(call RunSamevmBatch)
   494 	$(call RunSamevmBatch)
   492 
   495 
   493 # Stable samevm testruns (minus items from PROBLEM_LIST)
   496 # Stable samevm testruns (minus items from PROBLEM_LIST)
   494 JDK_ALL_TARGETS += jdk_nio1
   497 JDK_ALL_TARGETS += jdk_nio1
   495 jdk_nio1: java/nio/file
   498 jdk_nio1: $(call TestDirs, java/nio/file)
   496 	$(call RunSamevmBatch)
   499 	$(call RunSamevmBatch)
   497 
   500 
   498 # Stable samevm testruns (minus items from PROBLEM_LIST)
   501 # Stable samevm testruns (minus items from PROBLEM_LIST)
   499 JDK_ALL_TARGETS += jdk_nio2
   502 JDK_ALL_TARGETS += jdk_nio2
   500 jdk_nio2: java/nio/Buffer java/nio/ByteOrder \
   503 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
   501           java/nio/channels java/nio/BufferPoolMXBean java/nio/MappedByteBuffer
   504           java/nio/channels java/nio/BufferPoolMXBean java/nio/MappedByteBuffer)
   502 	$(call SharedLibraryPermissions,java/nio/channels)
   505 	$(call SharedLibraryPermissions,java/nio/channels)
   503 	$(call RunSamevmBatch)
   506 	$(call RunSamevmBatch)
   504 
   507 
   505 # Stable samevm testruns (minus items from PROBLEM_LIST)
   508 # Stable samevm testruns (minus items from PROBLEM_LIST)
   506 JDK_ALL_TARGETS += jdk_nio3
   509 JDK_ALL_TARGETS += jdk_nio3
   507 jdk_nio3: com/sun/nio sun/nio
   510 jdk_nio3: $(call TestDirs, com/sun/nio sun/nio)
   508 	$(call RunSamevmBatch)
   511 	$(call RunSamevmBatch)
   509 
   512 
   510 # All nio tests
   513 # All nio tests
   511 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
   514 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
   512 	@$(SummaryInfo)
   515 	@$(SummaryInfo)
   513 
   516 
   514 # Stable othervm testruns (minus items from PROBLEM_LIST)
   517 # Stable othervm testruns (minus items from PROBLEM_LIST)
   515 #   Using samevm has serious problems with these tests
   518 #   Using samevm has serious problems with these tests
   516 JDK_ALL_TARGETS += jdk_rmi
   519 JDK_ALL_TARGETS += jdk_rmi
   517 jdk_rmi: java/rmi javax/rmi sun/rmi
   520 jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
   518 	$(call RunOthervmBatch)
   521 	$(call RunOthervmBatch)
   519 
   522 
   520 # Stable samevm testruns (minus items from PROBLEM_LIST)
   523 # Stable samevm testruns (minus items from PROBLEM_LIST)
   521 JDK_ALL_TARGETS += jdk_security1
   524 JDK_ALL_TARGETS += jdk_security1
   522 jdk_security1: java/security
   525 jdk_security1: $(call TestDirs, java/security)
   523 	$(call RunSamevmBatch)
   526 	$(call RunSamevmBatch)
   524 
   527 
   525 # Stable othervm testruns (minus items from PROBLEM_LIST)
   528 # Stable othervm testruns (minus items from PROBLEM_LIST)
   526 #   Using samevm has serious problems with these tests
   529 #   Using samevm has serious problems with these tests
   527 JDK_ALL_TARGETS += jdk_security2
   530 JDK_ALL_TARGETS += jdk_security2
   528 jdk_security2: javax/crypto com/sun/crypto
   531 jdk_security2: $(call TestDirs, javax/crypto com/sun/crypto)
   529 	$(call RunOthervmBatch)
   532 	$(call RunOthervmBatch)
   530 
   533 
   531 # Stable othervm testruns (minus items from PROBLEM_LIST)
   534 # Stable othervm testruns (minus items from PROBLEM_LIST)
   532 #   Using samevm has serious problems with these tests
   535 #   Using samevm has serious problems with these tests
   533 JDK_ALL_TARGETS += jdk_security3
   536 JDK_ALL_TARGETS += jdk_security3
   534 jdk_security3: com/sun/security lib/security javax/security sun/security
   537 jdk_security3: $(call TestDirs, com/sun/security lib/security \
       
   538                javax/security sun/security)
   535 	$(call SharedLibraryPermissions,sun/security)
   539 	$(call SharedLibraryPermissions,sun/security)
   536 	$(call RunOthervmBatch)
   540 	$(call RunOthervmBatch)
   537 
   541 
   538 # All security tests
   542 # All security tests
   539 jdk_security: jdk_security1 jdk_security2 jdk_security3
   543 jdk_security: jdk_security1 jdk_security2 jdk_security3
   540 	@$(SummaryInfo)
   544 	@$(SummaryInfo)
   541 
   545 
   542 # Stable othervm testruns (minus items from PROBLEM_LIST)
   546 # Stable othervm testruns (minus items from PROBLEM_LIST)
   543 #   Using samevm has problems, and doesn't help performance as much as others.
   547 #   Using samevm has problems, and doesn't help performance as much as others.
   544 JDK_ALL_TARGETS += jdk_swing
   548 JDK_ALL_TARGETS += jdk_swing
   545 jdk_swing: javax/swing sun/java2d
   549 jdk_swing: $(call TestDirs, javax/swing sun/java2d)
   546 	$(call RunOthervmBatch)
   550 	$(call RunOthervmBatch)
   547 
   551 
   548 # Stable samevm testruns (minus items from PROBLEM_LIST)
   552 # Stable samevm testruns (minus items from PROBLEM_LIST)
   549 JDK_ALL_TARGETS += jdk_text
   553 JDK_ALL_TARGETS += jdk_text
   550 jdk_text: java/text sun/text
   554 jdk_text: $(call TestDirs, java/text sun/text)
   551 	$(call RunSamevmBatch)
   555 	$(call RunSamevmBatch)
   552 
   556 
   553 # Stable samevm testruns (minus items from PROBLEM_LIST)
   557 # Stable samevm testruns (minus items from PROBLEM_LIST)
   554 JDK_ALL_TARGETS += jdk_tools1
   558 JDK_ALL_TARGETS += jdk_tools1
   555 jdk_tools1: com/sun/jdi
   559 jdk_tools1: $(call TestDirs, com/sun/jdi)
   556 	$(call RunSamevmBatch)
   560 	$(call RunSamevmBatch)
   557 
   561 
   558 # Stable othervm testruns (minus items from PROBLEM_LIST)
   562 # Stable othervm testruns (minus items from PROBLEM_LIST)
   559 #   Using samevm has serious problems with these tests
   563 #   Using samevm has serious problems with these tests
   560 JDK_ALL_TARGETS += jdk_tools2
   564 JDK_ALL_TARGETS += jdk_tools2
   561 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing
   565 jdk_tools2: $(call TestDirs, \
       
   566             com/sun/tools sun/jvmstat sun/tools tools vm \
       
   567             com/sun/servicetag com/sun/tracing)
   562 	$(call SharedLibraryPermissions,tools/launcher)
   568 	$(call SharedLibraryPermissions,tools/launcher)
   563 	$(call RunSamevmBatch)
   569 	$(call RunSamevmBatch)
   564 
   570 
   565 # All tools tests
   571 # All tools tests
   566 jdk_tools: jdk_tools1 jdk_tools2
   572 jdk_tools: jdk_tools1 jdk_tools2
   567 	@$(SummaryInfo)
   573 	@$(SummaryInfo)
   568 
   574 
   569 # Stable samevm testruns (minus items from PROBLEM_LIST)
   575 # Stable samevm testruns (minus items from PROBLEM_LIST)
   570 JDK_ALL_TARGETS += jdk_util
   576 JDK_ALL_TARGETS += jdk_util
   571 jdk_util: java/util sun/util
   577 jdk_util: $(call TestDirs, java/util sun/util)
   572 	$(call RunSamevmBatch)
   578 	$(call RunSamevmBatch)
   573 
   579 
   574 # ------------------------------------------------------------------
   580 # ------------------------------------------------------------------
   575 
   581 
   576 # Run all tests
   582 # Run all tests