comparison make/Makefile @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents a7d3f7b5b462 98f3af397705
children 43223d3f5dcd
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
580 $(MKDIR) -p $(JDK_IMAGE_DIR) 580 $(MKDIR) -p $(JDK_IMAGE_DIR)
581 ($(CD) $(JDK_IMPORT_PATH) && \ 581 ($(CD) $(JDK_IMPORT_PATH) && \
582 $(TAR) -cf - *) | \ 582 $(TAR) -cf - *) | \
583 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 583 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
584 584
585
586 # Testing the built JVM
587 RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -Dsun.java.launcher=gamma
588 generic_test:
589 @$(ECHO) "Running with: $(ALTJVM_DIR)"
590 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
591 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
592
593 # C2 test targets
594 test_product test_optimized test_fastdebug test_jvmg:
595 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
596
597 # C1 test targets
598 test_product1 test_optimized1 test_fastdebug1 test_jvmg1:
599 ifeq ($(ARCH_DATA_MODEL), 32)
600 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
601 else
602 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
603 endif
604
605 # Zero test targets
606 test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero:
607 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
608
609 # Shark test targets
610 test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark:
611 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
612
613 # Minimal1 test targets
614 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1:
615 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
616
617
585 test_jdk: 618 test_jdk:
586 ifeq ($(JVM_VARIANT_CLIENT), true) 619 ifeq ($(JVM_VARIANT_CLIENT), true)
587 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion 620 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
588 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version 621 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
589 endif 622 endif