test/Makefile

*** 305,315 ****
      fi; \
      runc="`$(CAT) $(RUNLIST)      | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      passc="`$(CAT) $(PASSLIST)    | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      failc="`$(CAT) $(FAILLIST)    | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
!     $(ECHO) "TEST STATS: run=$${runc}  pass=$${passc}  fail=$${failc}  excluded=$${exclc}" \
        >> $(STATS_TXT); \
    else \
      $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \
    fi; \
    $(CAT) $(STATS_TXT); \
--- 305,315 ----
      fi; \
      runc="`$(CAT) $(RUNLIST)      | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      passc="`$(CAT) $(PASSLIST)    | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      failc="`$(CAT) $(FAILLIST)    | $(WC) -l | $(AWK) '{print $$1;}'`"; \
      exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
!     $(ECHO) "TEST STATS: name=$(UNIQUE_DIR)  run=$${runc}  pass=$${passc}  fail=$${failc}  excluded=$${exclc}" \
        >> $(STATS_TXT); \
    else \
      $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \
    fi; \
    $(CAT) $(STATS_TXT); \
*** 324,334 ****
          @$(ECHO) "Testing completed successfully"
  
  # Prep for output
  prep: clean
          @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
!         @$(MKDIR) -p `dirname $(ARCHIVE_BUNDLE)`
  
  # Cleanup
  clean:
          $(RM) -r $(ABS_TEST_OUTPUT_DIR)
          $(RM) $(ARCHIVE_BUNDLE)
--- 324,334 ----
          @$(ECHO) "Testing completed successfully"
  
  # Prep for output
  prep: clean
          @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
!         @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`
  
  # Cleanup
  clean:
          $(RM) -r $(ABS_TEST_OUTPUT_DIR)
          $(RM) $(ARCHIVE_BUNDLE)
*** 374,384 ****
          @$(ECHO) "NOTHING_EXCLUDED" > $@
  else
  $(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS)
          @$(RM) $@ $@.temp1 $@.temp2
          @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all'          ) ;\
!           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH)'   ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)'  ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)'      ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)'     ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all'             ) ;\
--- 374,384 ----
          @$(ECHO) "NOTHING_EXCLUDED" > $@
  else
  $(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS)
          @$(RM) $@ $@.temp1 $@.temp2
          @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all'          ) ;\
!           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)'          ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)'  ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)'      ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)'     ) ;\
            ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all'             ) ;\
*** 560,570 ****
  # Stable othervm testruns (minus items from PROBLEM_LIST)
  #   Using samevm has serious problems with these tests
  JDK_ALL_TARGETS += jdk_tools2
  jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing
          $(call SharedLibraryPermissions,tools/launcher)
!         $(call RunOthervmBatch)
  
  # All tools tests
  jdk_tools: jdk_tools1 jdk_tools2
          @$(SummaryInfo)
  
--- 560,570 ----
  # Stable othervm testruns (minus items from PROBLEM_LIST)
  #   Using samevm has serious problems with these tests
  JDK_ALL_TARGETS += jdk_tools2
  jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing
          $(call SharedLibraryPermissions,tools/launcher)
!         $(call RunSamevmBatch)
  
  # All tools tests
  jdk_tools: jdk_tools1 jdk_tools2
          @$(SummaryInfo)