equal
deleted
inserted
replaced
305 fi; \ |
305 fi; \ |
306 runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
306 runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
307 passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
307 passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
308 failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
308 failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
309 exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
309 exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ |
310 $(ECHO) "TEST STATS: run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ |
310 $(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ |
311 >> $(STATS_TXT); \ |
311 >> $(STATS_TXT); \ |
312 else \ |
312 else \ |
313 $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ |
313 $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ |
314 fi; \ |
314 fi; \ |
315 $(CAT) $(STATS_TXT); \ |
315 $(CAT) $(STATS_TXT); \ |
324 @$(ECHO) "Testing completed successfully" |
324 @$(ECHO) "Testing completed successfully" |
325 |
325 |
326 # Prep for output |
326 # Prep for output |
327 prep: clean |
327 prep: clean |
328 @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) |
328 @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) |
329 @$(MKDIR) -p `dirname $(ARCHIVE_BUNDLE)` |
329 @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` |
330 |
330 |
331 # Cleanup |
331 # Cleanup |
332 clean: |
332 clean: |
333 $(RM) -r $(ABS_TEST_OUTPUT_DIR) |
333 $(RM) -r $(ABS_TEST_OUTPUT_DIR) |
334 $(RM) $(ARCHIVE_BUNDLE) |
334 $(RM) $(ARCHIVE_BUNDLE) |
374 @$(ECHO) "NOTHING_EXCLUDED" > $@ |
374 @$(ECHO) "NOTHING_EXCLUDED" > $@ |
375 else |
375 else |
376 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS) |
376 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS) |
377 @$(RM) $@ $@.temp1 $@.temp2 |
377 @$(RM) $@ $@.temp1 $@.temp2 |
378 @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\ |
378 @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\ |
379 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH)' ) ;\ |
379 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)' ) ;\ |
380 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)' ) ;\ |
380 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)' ) ;\ |
381 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\ |
381 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\ |
382 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\ |
382 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\ |
383 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
383 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
384 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
384 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
560 # Stable othervm testruns (minus items from PROBLEM_LIST) |
560 # Stable othervm testruns (minus items from PROBLEM_LIST) |
561 # Using samevm has serious problems with these tests |
561 # Using samevm has serious problems with these tests |
562 JDK_ALL_TARGETS += jdk_tools2 |
562 JDK_ALL_TARGETS += jdk_tools2 |
563 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing |
563 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing |
564 $(call SharedLibraryPermissions,tools/launcher) |
564 $(call SharedLibraryPermissions,tools/launcher) |
565 $(call RunOthervmBatch) |
565 $(call RunSamevmBatch) |
566 |
566 |
567 # All tools tests |
567 # All tools tests |
568 jdk_tools: jdk_tools1 jdk_tools2 |
568 jdk_tools: jdk_tools1 jdk_tools2 |
569 @$(SummaryInfo) |
569 @$(SummaryInfo) |
570 |
570 |