Updated tests

Author: masuidrive

README.md

@@ -22,4 +22,3 @@ Original Authors "MobiRuby developers" are [https://github.com/mobiruby/mobiruby
 ## License
 
 See Copyright Notice in [mobiruby_common.h](https://github.com/mobiruby/mobiruby-common/blob/master/include/mobiruby_common.h).
-

test/.gitignore

@@ -1 +1,2 @@
-cfunc_test
+t/*.exe
+t/*.c

test/Makefile

@@ -1,21 +1,17 @@
 # makefile discription.
-# basic build file for cocoa library
+# basic build file for cfunc library
 
 # project-specific macros
 # extension of the executable-file is modifiable(.exe .out ...)
 BASEDIR = .
-TARGET := $(BASEDIR)/mobiruby-common-test
-MRBCSRC := $(patsubst %.rb,%.c,$(wildcard $(BASEDIR)/mrb/*.rb))
-MRBDATASRC := $(patsubst %.rb,%.c,$(wildcard $(BASEDIR)/mrb_data/*.rb))
-LIBR := $(BASEDIR)/../vendors/lib/libmruby-cfunc.a $(BASEDIR)/../lib/libmobiruby-common.a
-
-EXCEPT1 := $(MRBCSRC)
+REQUIRES := ./t/require1.rb
+TESTSRCS := $(filter-out $(REQUIRES),$(wildcard $(BASEDIR)/t/*.rb))
+TESTOBJS := $(patsubst %.rb,%.o,$(TESTSRCS))
+TESTS := $(patsubst %.rb,%.exe,$(TESTSRCS))
+REQUIREOBJS := $(patsubst %.rb,%.o,$(REQUIRES))
 
-OBJ1 := $(patsubst %.c,%.o,$(filter-out $(EXCEPT1),$(wildcard $(BASEDIR)/*.c)))
-OBJMRB := $(patsubst %.c,%.o,$(MRBCSRC))
-OBJMRBDATA := $(patsubst %.c,%.o,$(MRBDATASRC))
-OBJS := $(OBJ1) $(OBJ2) $(OBJ3)
 
+LIBR := $(BASEDIR)/../vendors/lib/libmruby-cfunc.a $(BASEDIR)/../lib/libmobiruby-common.a
 MRBC := $(BASEDIR)/../vendors/bin/mrbc
 
 # libffi
@@ -28,7 +24,7 @@ LIBS = -ldl -lm
 ifeq ($(shell uname -s),Darwin)
   LDFLAGS = -Wl,-allow_stack_execute
 else
-  LDFLAGS = 
+  LDFLAGS = -Wl,--export-dynamic
 endif
 
 ifeq ($(strip $(COMPILE_MODE)),)
@@ -47,7 +43,6 @@ endif
 ALL_CFLAGS = -Wall -Werror-implicit-function-declaration -std=c99 $(CFLAGS) $(MRUBY_CFLAGS) $(LIBFFI_CFLAGS)
 
 
-
 ##############################
 # internal variables
 
@@ -60,35 +55,45 @@ export CAT := cat
 # generic build targets, rules
 
 .PHONY : all
-all : $(TARGET)
+all : $(TESTS)
 
 .PHONY : run
-run : $(TARGET)
-	./$(TARGET)
+run : $(TESTS)
+	@echo
+	@echo "*** Start tests ***"
+	@echo
+	@for command in $(TESTS) ; do \
+	    $$command || exit 1 ; \
+	    echo ; \
+	done
+
 
 # executable constructed using linker from object files
-$(TARGET) : $(OBJS) $(OBJMRB) $(LIBR) $(OBJMRBDATA)
-	$(LL) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(MRUBY_LIBS) $(LIBFFI_LIBS) $(LIBS)
+$(TESTS) : %.exe : %.o $(REQUIREOBJS)
+	$(LL) $< $(REQUIREOBJS) -o $@ $(CFLAGS) $(LDFLAGS) $(LIBR) $(LIBFFI_LIBS) $(MRUBY_LIBS) $(LIBS) 
+
 
--include $(OBJS:.o=.d) $(OBJMRB:.o=.d) $(OBJMRBDATA:.o=.d)
+-include $(OBJS:.o=.d) $(OBJMRB:.o=.d)
 
 # mrby complie
-$(OBJMRB) : %.o : %.rb
-	$(MRBC) -Cinit_$(*F) $<
+$(TESTOBJS) : %.o : %.rb
+	cat $< | ruby -e "print STDIN.read.gsub(/#\s*BEGIN\s+C.*/m,'')" | $(MRBC) -o- -Btest_irep - > $(basename $<).c
+	echo "const char* appname = \"$(basename $<)\";" >> $(basename $<).c
+	cat main.c >> $(basename $<).c
+	cat $< | ruby -e 's=STDIN.read;print s.gsub(/.*#\s*BEGIN\s+C(.*)/m,"\\1") if s.match(/#\s*BEGIN\s+C/)' >> $(basename $<).c
 	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $(basename $<).c -o $@
 
-$(OBJMRBDATA) : %.o : %.rb
-	$(MRBC) -Bmruby_data_$(*F) $<
+$(REQUIREOBJS) : %.o : %.rb
+	echo $<
+	echo $(basename $<)
+	$(MRBC) -Bmruby_data_`basename $(basename $<)` $<
 	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $(basename $<).c -o $@
 
-# objects compiled from source
-$(OBJS) : %.o : %.c
-	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
-
 # clean up
 .PHONY : clean #cleandep
 clean :
 	@echo "make: removing targets, objects and depend files of `pwd`"
-	-$(RM_F) $(TARGET) $(OBJS) $(OBJMRB) $(OBJMRBDATA) $(MRB)
-	-$(RM_F) $(OBJS:.o=.d) $(OBJY:.o=.d)
-	-$(RM_F) $(patsubst %.c,%.o,$(EXCEPT1)) $(patsubst %.c,%.d,$(EXCEPT1))
+	-$(RM_F) $(TESTS) $(TESTOBJS) $(TESTS)
+	-$(RM_F) $(TESTOBJS:.o=.d) $(TESTOBJS:.o=.c)
+	-$(RM_F) t/require/require1.c t/require/require1.o t/require/require1.d
+

test/main.c

@@ -1,69 +1,109 @@
 #include "cfunc.h"
+#include "mobiruby_common.h"
 
 #include "mruby.h"
 #include "mruby/dump.h"
 #include "mruby/proc.h"
 #include "mruby/compile.h"
-#include "mobiruby_common.h"
 
 struct mrb_state_ud {
     struct cfunc_state cfunc_state;
 };
 
-
-void
-init_unittest(mrb_state *mrb);
-
-void
-init_mobi_common_test(mrb_state *mrb);
-
+const char* assert_rb = 
+"$ok_test = 0" "\n"
+"$ko_test = 0" "\n"
+"$kill_test = 0" "\n"
+"$asserts  = []" "\n"
+""
+"def assert(test, failure_message = 'Assertion failed')" "\n"
+"  assert_equal(true, !!test, failure_message)" "\n"
+"end" "\n"
+""
+"def assert_not_equal(expected, actual, failure_message = nil)" "\n"
+"  assert_equal(false, expected === actual, \"#{actual} expected not '#{expected}' assertion failed\")" "\n"
+"end" "\n"
+""
+"def assert_equal(expected, actual, failure_message = nil)" "\n"
+"  failure_message ||= \"#{actual} expected '#{expected}' assertion failed\"" "\n"
+"  begin" "\n"
+"    if expected === actual" "\n"
+"      $ok_test += 1" "\n"
+"      print('.')" "\n"
+"    else" "\n"
+"      $asserts.push(['Fail: ', failure_message])" "\n"
+"      $ko_test += 1" "\n"
+"      print('F')" "\n"
+"    end" "\n"
+"  rescue Exception => e" "\n"
+"    $asserts.push(['Error: ', failure_message, e])" "\n"
+"    $kill_test += 1" "\n"
+"    print('X')" "\n"
+"  end" "\n"
+"end" "\n"
+""
+// This method copy from mruby/test/assert.rb" "\n"
+// License: MITL mruby developers" "\n"
+// Report the test result and print all assertions" "\n"
+// which were reported broken." "\n"
+"def test_results()" "\n"
+"  print \"\\n\"" "\n"
+"  $asserts.each do |err, str, e|" "\n"
+"    print(err);" "\n"
+"    print(str);" "\n"
+"    if e" "\n"
+"      print(\" => \")" "\n"
+"      print(e.message)" "\n"
+"    end" "\n"
+"    print(\"\\n\")" "\n"
+"  end" "\n"
+""
+"  $total_test = $ok_test.+($ko_test)" "\n"
+"  print('Total: ')" "\n"
+"  print($total_test)" "\n"
+"  print(\"\\n\")" "\n"
+""
+"  print('   OK: ')" "\n"
+"  print($ok_test)" "\n"
+"  print(\"\\n\")" "\n"
+"  print('   KO: ')" "\n"
+"  print($ko_test)" "\n"
+"  print(\"\\n\")" "\n"
+"  print('Crash: ')" "\n"
+"  print($kill_test)" "\n"
+"  print(\"\\n\")" "\n"
+""
+"  ($ko_test + $kill_test) == 0" "\n"
+"end";
 
 int main(int argc, char *argv[])
 {
+    printf("%s: ", appname);
+
     mrb_state *mrb = mrb_open();
     mrb->ud = malloc(sizeof(struct mrb_state_ud));
 
     cfunc_state_offset = cfunc_offsetof(struct mrb_state_ud, cfunc_state);
     init_cfunc_module(mrb);
     init_mobiruby_common_module(mrb);
 
-    init_unittest(mrb);
+    mrb_load_string(mrb, assert_rb);
     if (mrb->exc) {
         mrb_p(mrb, mrb_obj_value(mrb->exc));
+        exit(1);
     }
 
-    init_mobi_common_test(mrb);
+    int n = mrb_read_irep(mrb, test_irep);
+    mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));
     if (mrb->exc) {
         mrb_p(mrb, mrb_obj_value(mrb->exc));
+        mrb_load_string(mrb, "test_results();");
+        exit(1);
+    }
+    if(mrb_test(mrb_load_string(mrb, "test_results()"))) {
+        exit(0);
+    }
+    else {
+        exit(1);
     }
-}
-
-
-struct STest {
-    int8_t x;
-    int16_t y;
-    int32_t z;
-};
-
-
-struct STest2 {
-    struct STest s;
-    double xx;
-};
-
-
-struct STest cfunc_test_func1(struct STest val) {
-    val.z = val.x + val.y;
-    return val;
-};
-
-
-struct STest2 cfunc_test_func2(struct STest2 val) {
-    val.xx = (double)(val.s.x + val.s.y) / val.s.z;
-    return val;
-};
-
-
-int cfunc_test_func3(int (*func)(int, int)) {
-    return func(10, 20);
 }