From f0992147ae015978319a1f919a30c5e35328b469 Mon Sep 17 00:00:00 2001
From: Jim Garrison <jim@garrison.cc>
Date: Wed, 6 May 2015 01:37:52 -0700
Subject: [PATCH] Run the tests on julia-debug if JULIA_DEBUG==1

---
 Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index dc1aa942eef52..5959d501e52cb 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ ifeq ($(JULIA_BINARYDIST_TARNAME),)
 endif
 
 ifeq ($(JULIA_DEBUG), 1)
-default: debug
+JULIA_BUILD_MODE = debug
 else
-default: release
+JULIA_BUILD_MODE = release
 endif
+default: $(JULIA_BUILD_MODE)
 all: debug release
 
 # sort is used to remove potential duplicates
@@ -481,18 +482,18 @@ distcleanall: cleanall
 	install binary-dist light-source-dist.tmp light-source-dist \
 	dist full-source-dist source-dist
 
-test: check-whitespace release
-	@$(MAKE) $(QUIET_MAKE) -C test default
+test: check-whitespace default
+	@$(MAKE) $(QUIET_MAKE) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))" -C test default
 
-testall: check-whitespace release
-	cp $(build_prefix)/lib/julia/sys.ji local.ji && $(JULIA_EXECUTABLE) -J local.ji -e 'true' && rm local.ji
-	@$(MAKE) $(QUIET_MAKE) -C test all
+testall: check-whitespace default
+	cp $(build_prefix)/lib/julia/sys.ji local.ji && $(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE)) -J local.ji -e 'true' && rm local.ji
+	@$(MAKE) $(QUIET_MAKE) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))" -C test all
 
-testall1: check-whitespace release
-	@env JULIA_CPU_CORES=1 $(MAKE) $(QUIET_MAKE) -C test all
+testall1: check-whitespace default
+	@env JULIA_CPU_CORES=1 $(MAKE) $(QUIET_MAKE) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))" -C test all
 
-test-%: check-whitespace release
-	@$(MAKE) $(QUIET_MAKE) -C test $*
+test-%: check-whitespace default
+	@$(MAKE) $(QUIET_MAKE) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))" -C test $*
 
 perf: release
 	@$(MAKE) $(QUIET_MAKE) -C test/perf