Skip to content

Commit

Permalink
Run the tests on julia-debug if JULIA_DEBUG==1
Browse files Browse the repository at this point in the history
  • Loading branch information
garrison authored and vtjnash committed May 11, 2015
1 parent 842ccae commit a4d019e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
8 changes: 7 additions & 1 deletion Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -875,9 +875,15 @@ wine_pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(shell printf %s\n '
endif
pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(2)))))

ifeq ($(JULIA_DEBUG), 1)
JULIA_BUILD_MODE = debug
else
JULIA_BUILD_MODE = release
endif

JULIA_EXECUTABLE_debug = $(build_bindir)/julia-debug$(EXE)
JULIA_EXECUTABLE_release = $(build_bindir)/julia$(EXE)
JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_release)
JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))

# Colors for make
ifndef VERBOSE
Expand Down
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ ifeq ($(JULIA_BINARYDIST_TARNAME),)
JULIA_BINARYDIST_TARNAME = julia-$(JULIA_COMMIT)-$(OS)-$(ARCH)
endif

ifeq ($(JULIA_DEBUG), 1)
default: debug
else
default: release
endif
default: $(JULIA_BUILD_MODE) # contains either "debug" or "release"
all: debug release

# sort is used to remove potential duplicates
Expand Down Expand Up @@ -481,17 +477,17 @@ distcleanall: cleanall
install binary-dist light-source-dist.tmp light-source-dist \
dist full-source-dist source-dist

test: check-whitespace release
test: check-whitespace $(JULIA_BUILD_MODE)
@$(MAKE) $(QUIET_MAKE) -C test default

testall: check-whitespace release
testall: check-whitespace $(JULIA_BUILD_MODE)
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

testall1: check-whitespace release
testall1: check-whitespace $(JULIA_BUILD_MODE)
@env JULIA_CPU_CORES=1 $(MAKE) $(QUIET_MAKE) -C test all

test-%: check-whitespace release
test-%: check-whitespace $(JULIA_BUILD_MODE)
@$(MAKE) $(QUIET_MAKE) -C test $*

perf: release
Expand Down

0 comments on commit a4d019e

Please sign in to comment.