Move Gem Tests into the main Test target

2 files changed, 10 insertions, 25 deletions

diff --git a/mrbgems/Makefile b/mrbgems/Makefile
index 1cb5b8a83..d12e85ab4 100644
--- a/mrbgems/Makefile
+++ b/mrbgems/Makefile
@@ -5,7 +5,7 @@ LIBR := ../lib/libmruby.a
 INIT := init_gems
 RM_F := rm -f
 CC_FLAGS := -Wall -Werror-implicit-function-declaration -g -O3 -MMD -I. -I./../include
-MMAKER := ./gem_helper
+MMAKER := ./generator
 MMAKER_BIN := $(MMAKER)
 export CC = gcc
 export LL = gcc
@@ -43,8 +43,9 @@ $(MMAKER_BIN) : $(MMAKER).o
 $(MMAKER).o : $(MMAKER).c
 	$(CC) $(CC_FLAGS) -MMD -c $< -o $@
 
-test :
-	@$(MAKE) test -C g
+.PHONY : prepare-test
+prepare-test :
+	@$(MAKE) prepare-test -C g
 
 # clean driver and all gems
 .PHONY : clean
diff --git a/mrbgems/gem_helper.c b/mrbgems/generator.c
index 24b959df9..8d8bee0cf 100644
--- a/mrbgems/gem_helper.c
+++ b/mrbgems/generator.c
@@ -138,32 +138,16 @@ make_gem_makefile()
   for_each_gem(" ", "/mrblib/*.rb", "\tcat", "> mrblib_gem.rbtmp", "mrblib");
   puts("");
 
-  puts(".PHONY : test");
-  puts("test : mrbtest");
-  puts("\t@./mrbtest");
+  puts(".PHONY : prepare-test");
+  puts("prepare-test : mrbgemtest.ctmp");
   puts("");
 
-  puts("mrbtest : driver.o mrbtest.o");
-  puts("\t$(CC) $(CFLAGS) -o ./mrbtest ./mrbtest.o ../../lib/libmruby.a ./driver.o");
+  puts("mrbgemtest.ctmp : mrbgemtest.rbtmp");
+  puts("\t../../bin/mrbc -Bmrbgemtest_irep -omrbgemtest.ctmp mrbgemtest.rbtmp");
   puts("");
 
-  puts("driver.o : ../../test/driver.c");
-  puts("\t$(CC) $(CFLAGS) -o $@ -c $<");
-  puts("");
-
-  puts("mrbtest.o : mrbtest.c");
-  puts("");
-
-  puts("mrbtest.c : mrbtest.ctmp");
-  puts("\tcat ../../test/init_mrbtest.c mrbtest.ctmp > mrbtest.c");
-  puts("");
-
-  puts("mrbtest.ctmp : mrbtest.rbtmp");
-  puts("\t../../bin/mrbc -Bmrbtest_irep -omrbtest.ctmp mrbtest.rbtmp");
-  puts("");
-
-  puts("mrbtest.rbtmp :");
-  for_each_gem("", "/test/*.rb ", "\tcat ../../test/assert.rb ", "> mrbtest.rbtmp", "");
+  puts("mrbgemtest.rbtmp :");
+  for_each_gem(" ", "/test/*.rb ", "\tcat", " > mrbgemtest.rbtmp", "");
   puts("");
 
   puts(".PHONY : clean");