*** old/make/solaris/Makefile	Fri Sep 21 10:48:45 2012
--- new/make/solaris/Makefile	Fri Sep 21 10:48:45 2012

*** 235,273 ****
--- 235,283 ----
  
  # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
          cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+ ifeq ($(TEST_IN_BUILD),true)
          cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ endif
  ifdef INSTALL
          cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
  endif
  
  $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
          cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+ ifeq ($(TEST_IN_BUILD),true)
          cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ endif
  ifdef INSTALL
          cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
  $(TARGETS_C1):  $(SUBDIRS_C1)
          cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+ ifeq ($(TEST_IN_BUILD),true)
          cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ endif
  ifdef INSTALL
          cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
  $(TARGETS_CORE):  $(SUBDIRS_CORE)
          cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+ ifeq ($(TEST_IN_BUILD),true)
          cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ endif
  ifdef INSTALL
          cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
  $(TARGETS_KERNEL):  $(SUBDIRS_KERNEL)
          cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
+ ifeq ($(TEST_IN_BUILD),true)
          cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
+ endif
  ifdef INSTALL
          cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
  # Just build the tree, and nothing else: