jdk/test/Makefile
changeset 11281 58ecbc808474
parent 10607 1ba66093449c
child 11523 85131f3172a1
equal deleted inserted replaced
11280:50713152130d 11281:58ecbc808474
   320   $(TESTEXIT) \
   320   $(TESTEXIT) \
   321 )
   321 )
   322 
   322 
   323 ################################################################
   323 ################################################################
   324 
   324 
   325 # Default make rule (runs jtreg_tests)
   325 # Default make rule (runs default jdk tests)
   326 all: jtreg_tests
   326 all: jdk_default
   327 	@$(ECHO) "Testing completed successfully"
   327 	@$(ECHO) "Testing completed successfully"
   328 
   328 
   329 # Prep for output
   329 # Prep for output
   330 prep: clean
   330 prep: clean
   331 	@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
   331 	@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
   420 endef
   420 endef
   421 
   421 
   422 # ------------------------------------------------------------------
   422 # ------------------------------------------------------------------
   423 
   423 
   424 # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
   424 # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
       
   425 JDK_DEFAULT_TARGETS =
   425 JDK_ALL_TARGETS =
   426 JDK_ALL_TARGETS =
   426 
   427 
   427 # Stable othervm testruns (minus items from PROBLEM_LIST)
   428 # Stable othervm testruns (minus items from PROBLEM_LIST)
   428 #   Using agentvm has problems, and doesn't help performance as much as others.
   429 #   Using agentvm has problems, and doesn't help performance as much as others.
   429 JDK_ALL_TARGETS += jdk_awt
   430 JDK_ALL_TARGETS += jdk_awt
   431          javax/imageio javax/print sun/pisces)
   432          javax/imageio javax/print sun/pisces)
   432 	$(call RunOthervmBatch)
   433 	$(call RunOthervmBatch)
   433 
   434 
   434 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   435 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   435 JDK_ALL_TARGETS += jdk_beans1
   436 JDK_ALL_TARGETS += jdk_beans1
       
   437 JDK_DEFAULT_TARGETS += jdk_beans1
   436 jdk_beans1: $(call TestDirs, \
   438 jdk_beans1: $(call TestDirs, \
   437             java/beans/beancontext java/beans/PropertyChangeSupport \
   439             java/beans/beancontext java/beans/PropertyChangeSupport \
   438             java/beans/Introspector java/beans/Performance \
   440             java/beans/Introspector java/beans/Performance \
   439             java/beans/VetoableChangeSupport java/beans/Statement)
   441             java/beans/VetoableChangeSupport java/beans/Statement)
   440 	$(call RunAgentvmBatch)
   442 	$(call RunAgentvmBatch)
   457 jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
   459 jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
   458 	@$(SummaryInfo)
   460 	@$(SummaryInfo)
   459 
   461 
   460 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   462 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   461 JDK_ALL_TARGETS += jdk_io
   463 JDK_ALL_TARGETS += jdk_io
       
   464 JDK_DEFAULT_TARGETS += jdk_io
   462 jdk_io: $(call TestDirs, java/io)
   465 jdk_io: $(call TestDirs, java/io)
   463 	$(call RunAgentvmBatch)
   466 	$(call RunAgentvmBatch)
   464 
   467 
   465 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   468 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   466 JDK_ALL_TARGETS += jdk_lang
   469 JDK_ALL_TARGETS += jdk_lang
       
   470 JDK_DEFAULT_TARGETS += jdk_lang
   467 jdk_lang: $(call TestDirs, java/lang)
   471 jdk_lang: $(call TestDirs, java/lang)
   468 	$(call RunAgentvmBatch)
   472 	$(call RunAgentvmBatch)
   469 
   473 
   470 # Stable othervm testruns (minus items from PROBLEM_LIST)
   474 # Stable othervm testruns (minus items from PROBLEM_LIST)
   471 #   Using agentvm has serious problems with these tests
   475 #   Using agentvm has serious problems with these tests
   483 jdk_management: jdk_management1 jdk_management2
   487 jdk_management: jdk_management1 jdk_management2
   484 	@$(SummaryInfo)
   488 	@$(SummaryInfo)
   485 
   489 
   486 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   490 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   487 JDK_ALL_TARGETS += jdk_math
   491 JDK_ALL_TARGETS += jdk_math
       
   492 JDK_DEFAULT_TARGETS += jdk_math
   488 jdk_math: $(call TestDirs, java/math)
   493 jdk_math: $(call TestDirs, java/math)
   489 	$(call RunAgentvmBatch)
   494 	$(call RunAgentvmBatch)
   490 
   495 
   491 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   496 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   492 JDK_ALL_TARGETS += jdk_misc
   497 JDK_ALL_TARGETS += jdk_misc
       
   498 JDK_DEFAULT_TARGETS += jdk_misc
   493 jdk_misc: $(call TestDirs, \
   499 jdk_misc: $(call TestDirs, \
   494           demo/jvmti demo/zipfs javax/naming javax/script \
   500           demo/jvmti demo/zipfs javax/naming javax/script \
   495           javax/smartcardio com/sun/jndi com/sun/xml sun/misc)
   501           javax/smartcardio com/sun/jndi com/sun/xml sun/misc)
   496 	$(call RunAgentvmBatch)
   502 	$(call RunAgentvmBatch)
   497 
   503 
   498 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   504 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   499 JDK_ALL_TARGETS += jdk_net
   505 JDK_ALL_TARGETS += jdk_net
       
   506 JDK_DEFAULT_TARGETS += jdk_net
   500 jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
   507 jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
   501 	$(call RunAgentvmBatch)
   508 	$(call RunAgentvmBatch)
   502 
   509 
   503 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   510 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   504 JDK_ALL_TARGETS += jdk_nio1
   511 JDK_ALL_TARGETS += jdk_nio1
       
   512 JDK_DEFAULT_TARGETS += jdk_nio1
   505 jdk_nio1: $(call TestDirs, java/nio/file)
   513 jdk_nio1: $(call TestDirs, java/nio/file)
   506 	$(call RunAgentvmBatch)
   514 	$(call RunAgentvmBatch)
   507 
   515 
   508 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   516 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   509 JDK_ALL_TARGETS += jdk_nio2
   517 JDK_ALL_TARGETS += jdk_nio2
       
   518 JDK_DEFAULT_TARGETS += jdk_nio2
   510 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
   519 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
   511           java/nio/channels java/nio/MappedByteBuffer)
   520           java/nio/channels java/nio/MappedByteBuffer)
   512 	$(call SharedLibraryPermissions,java/nio/channels)
   521 	$(call SharedLibraryPermissions,java/nio/channels)
   513 	$(call RunAgentvmBatch)
   522 	$(call RunAgentvmBatch)
   514 
   523 
   515 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   524 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   516 JDK_ALL_TARGETS += jdk_nio3
   525 JDK_ALL_TARGETS += jdk_nio3
       
   526 JDK_DEFAULT_TARGETS += jdk_nio3
   517 jdk_nio3: $(call TestDirs, sun/nio)
   527 jdk_nio3: $(call TestDirs, sun/nio)
   518 	$(call RunAgentvmBatch)
   528 	$(call RunAgentvmBatch)
   519 
   529 
   520 # All nio tests
   530 # All nio tests
   521 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
   531 jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
   531 jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
   541 jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
   532 	$(call RunOthervmBatch)
   542 	$(call RunOthervmBatch)
   533 
   543 
   534 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   544 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   535 JDK_ALL_TARGETS += jdk_security1
   545 JDK_ALL_TARGETS += jdk_security1
       
   546 JDK_DEFAULT_TARGETS += jdk_security1
   536 jdk_security1: $(call TestDirs, java/security)
   547 jdk_security1: $(call TestDirs, java/security)
   537 	$(call RunAgentvmBatch)
   548 	$(call RunAgentvmBatch)
   538 
   549 
   539 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   550 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   540 JDK_ALL_TARGETS += jdk_security2
   551 JDK_ALL_TARGETS += jdk_security2
   564            demo/jfc com/sun/java/swing)
   575            demo/jfc com/sun/java/swing)
   565 	$(call RunOthervmBatch)
   576 	$(call RunOthervmBatch)
   566 
   577 
   567 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   578 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   568 JDK_ALL_TARGETS += jdk_text
   579 JDK_ALL_TARGETS += jdk_text
       
   580 JDK_DEFAULT_TARGETS += jdk_text
   569 jdk_text: $(call TestDirs, java/text sun/text)
   581 jdk_text: $(call TestDirs, java/text sun/text)
   570 	$(call RunAgentvmBatch)
   582 	$(call RunAgentvmBatch)
   571 
   583 
   572 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   584 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   573 JDK_ALL_TARGETS += jdk_tools1
   585 JDK_ALL_TARGETS += jdk_tools1
   587 jdk_tools: jdk_tools1 jdk_tools2
   599 jdk_tools: jdk_tools1 jdk_tools2
   588 	@$(SummaryInfo)
   600 	@$(SummaryInfo)
   589 
   601 
   590 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   602 # Stable agentvm testruns (minus items from PROBLEM_LIST)
   591 JDK_ALL_TARGETS += jdk_util
   603 JDK_ALL_TARGETS += jdk_util
       
   604 JDK_DEFAULT_TARGETS += jdk_util
   592 jdk_util: $(call TestDirs, java/util sun/util)
   605 jdk_util: $(call TestDirs, java/util sun/util)
   593 	$(call RunAgentvmBatch)
   606 	$(call RunAgentvmBatch)
   594 
   607 
   595 # ------------------------------------------------------------------
   608 # ------------------------------------------------------------------
   596 
   609 
       
   610 # Run default tests
       
   611 jdk_default: $(JDK_DEFAULT_TARGETS)
       
   612 	@$(SummaryInfo)
       
   613 
   597 # Run all tests
   614 # Run all tests
   598 FILTER_OUT_LIST=jdk_awt jdk_rmi jdk_swing
   615 jdk_all: $(JDK_ALL_TARGETS)
   599 JDK_ALL_STABLE_TARGETS := $(filter-out $(FILTER_OUT_LIST), $(JDK_ALL_TARGETS))
       
   600 jdk_all: $(JDK_ALL_STABLE_TARGETS)
       
   601 	@$(SummaryInfo)
   616 	@$(SummaryInfo)
   602 
   617 
   603 # These are all phony targets
   618 # These are all phony targets
   604 PHONY_LIST += $(JDK_ALL_TARGETS)
   619 PHONY_LIST += $(JDK_ALL_TARGETS)
   605 
   620