diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-11-08 17:23:51 +0900 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-11-08 17:23:51 +0900 |
| commit | e1e369470eb41453cb79abdbbbdb9158489e2d26 (patch) | |
| tree | 0e4dce8c16af6f8519869a71c9c44f3ee2f3595b /test/Makefile | |
| parent | cdb72a05a294eb8521dd40c011160228496312cb (diff) | |
| parent | 1c95f4eb82d525d7d5eacd214904d262554bf93d (diff) | |
| download | mruby-e1e369470eb41453cb79abdbbbdb9158489e2d26.tar.gz mruby-e1e369470eb41453cb79abdbbbdb9158489e2d26.zip | |
Merge new change
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile index 183e03438..b06343084 100644 --- a/test/Makefile +++ b/test/Makefile @@ -18,6 +18,13 @@ ASSLIB := $(BASEDIR)/assert.rb MRBS := $(BASEDIR)/t/*.rb OBJS := driver.o $(MLIB) +# for mruby/mrbc test +REPLIB := $(BASEDIR)/report.rb +TESTRB := mrubytest.rb +TESTMRB := mrubytest.mrb +TESTRB_REP := mrubytest.rb.report +TESTMRB_REP := mrubytest.mrb.report + # libraries, includes LIBS = -lm INCLUDES = -I$(BASEDIR)/../src -I$(BASEDIR)/../include @@ -44,19 +51,37 @@ endif # mruby compiler and test driver ifeq ($(OS),Windows_NT) +<<<<<<< HEAD MRBC = ../bin/mrbc.exe EXE := $(TARGET).exe else MRBC = ../bin/mrbc EXE := $(TARGET) +======= +MRBC = ../bin/mrbc.exe +MRUBY= ../bin/mruby.exe +EXE := $(TARGET).exe +else +MRBC = ../bin/mrbc +MRUBY= ../bin/mruby +EXE := $(TARGET) +>>>>>>> upstream/master endif ############################## # generic build targets, rules .PHONY : test -all : $(EXE) +all : $(EXE) $(MRUBY) $(TESTRB) $(TESTMRB) + @echo "# exec mrbtest" ./$(EXE) + @echo + @echo "# exec mruby test with ruby script" + @($(MRUBY) $(TESTRB) > $(TESTRB_REP) && echo "mrubytest.rb success.") || $(CAT) $(TESTRB_REP) + @echo + @echo "# exec mruby test with mrb file" + @($(MRUBY) -b $(TESTMRB) > $(TESTMRB_REP) && echo "mrubytest.mrb success.") || $(CAT) $(TESTMRB_REP) + @echo # executable constructed using linker from object files $(EXE) : $(OBJS) $(LIBR) @@ -80,8 +105,16 @@ $(DLIB) : $(RLIB) $(MRBC) $(RLIB) : $(ASSLIB) $(MRBS) $(CAT) $(ASSLIB) $(MRBS) > $@ +# Compile mrb file from mruby source +$(TESTMRB) : $(MRBC) $(TESTRB) + $(MRBC) $(TESTRB) + +$(TESTRB) : $(ASSLIB) $(MRBS) $(REPLIB) + $(CAT) $(ASSLIB) $(MRBS) $(REPLIB) > $@ + # clean up .PHONY : clean clean : @echo "make: removing targets, objects and depend files of `pwd`" -$(RM_F) $(MLIB) $(CLIB) $(RLIB) $(DLIB) $(DEPLIB) $(OBJS) $(EXE) + -$(RM_F) $(TESTRB) $(TESTMRB) $(TESTRB_REP) $(TESTMRB_REP) |