Skip to content

Commit

Permalink
Merge branch 'master' of github.com:liuml07/giri
Browse files Browse the repository at this point in the history
  • Loading branch information
liuml07 committed Aug 20, 2014
2 parents 2cf39a9 + 84f5d8f commit fd7a957
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ compiler: gcc

os: linux

env: LLVM_HOME=$HOME/llvm BuildMode=Release+Asserts TEST_PARALLELISM=seq
env: LLVM_HOME=$HOME/llvm BuildMode=Release+Asserts TEST_PARALLELISM=seq TEST_LOG=test.log

before_script:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
Expand Down
8 changes: 6 additions & 2 deletions test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

.PHONY: test lib clean

TEST_LOG ?= /dev/null

# The default target in this directory is the test:: target
test:: lib
@ echo "Running the test cases..."
Expand All @@ -15,7 +17,7 @@ test:: lib
printf "\033[37m%-20s" "$$t";\
make clean -s -C $$t > /dev/null 2>&1;\
make -s -C $$t > /dev/null 2>&1;\
make test -s -C $$t DEBUGFLAGS= > /dev/null 2>&1;\
make test -s -C $$t DEBUGFLAGS= >> $(TEST_LOG) 2>&1;\
if [ $$? -eq 0 ]; then\
printf "\033[34m[PASS]\033[0m\n";\
else\
Expand All @@ -24,12 +26,14 @@ test:: lib
fi;\
make clean -s -C $$t > /dev/null 2>&1;\
done;\
[ "$(TEST_LOG)" != "/dev/null" ] && cat $(TEST_LOG);\
exit $$RET

lib:
@ echo -n "Building the Giri..."
@ $(MAKE) -s -C ../build 2>&1 > /dev/null || (echo "Fail to build the Giri lib!" && exit 1)
@ echo

clean:
@ for t in $$(cat auto-tests.txt); do make clean -C $$t; done
@ rm -f $(TEST_LOG)

0 comments on commit fd7a957

Please sign in to comment.