comparison make/Makefile @ 4364:1c8db54ee9f3

Added tag hs25-b24 for changeset e3a41fc02348
author amurillo
date Sat, 23 Mar 2013 01:47:25 -0700
parents 1b0dc9f87e75
children f36e073d56a4
comparison
equal deleted inserted replaced
27:c8832e0f48f9 28:e72f37d5c23e
530 $(MKDIR) -p $(JDK_IMAGE_DIR) 530 $(MKDIR) -p $(JDK_IMAGE_DIR)
531 ($(CD) $(JDK_IMPORT_PATH) && \ 531 ($(CD) $(JDK_IMPORT_PATH) && \
532 $(TAR) -cf - *) | \ 532 $(TAR) -cf - *) | \
533 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 533 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
534 534
535
536 # Testing the built JVM
537 RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -Dsun.java.launcher=gamma
538 generic_test:
539 @$(ECHO) "Running with: $(ALTJVM_DIR)"
540 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
541 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
542
543 # C2 test targets
544 test_product test_optimized test_fastdebug test_jvmg:
545 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
546
547 # C1 test targets
548 test_product1 test_optimized1 test_fastdebug1 test_jvmg1:
549 ifeq ($(ARCH_DATA_MODEL), 32)
550 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
551 else
552 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
553 endif
554
555 # Zero test targets
556 test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero:
557 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
558
559 # Shark test targets
560 test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark:
561 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
562
563 # Minimal1 test targets
564 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1:
565 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
566
567
535 test_jdk: 568 test_jdk:
536 ifeq ($(JVM_VARIANT_CLIENT), true) 569 ifeq ($(JVM_VARIANT_CLIENT), true)
537 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion 570 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
538 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version 571 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
539 endif 572 endif