From 26c6031a53867011eb33b624ed245d5603b778cf Mon Sep 17 00:00:00 2001
From: Daniel Bovensiepen <daniel@bovensiepen.net>
Date: Wed, 16 May 2012 16:07:55 +0800
Subject: Move assert lib for tests one directory up and add it always in the
 beginning

---
 test/Makefile     |  3 ++-
 test/assert.rb    | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 test/t/_assert.rb | 67 -------------------------------------------------------
 3 files changed, 69 insertions(+), 68 deletions(-)
 create mode 100644 test/assert.rb
 delete mode 100644 test/t/_assert.rb

(limited to 'test')

diff --git a/test/Makefile b/test/Makefile
index 26c898704..7f5c16980 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,6 +12,7 @@ INIT := init_$(TARGET).c
 DLIB := $(TARGET).ctmp
 RLIB := $(TARGET).rbtmp
 DEPLIB := $(TARGET).d driver.d
+ASSLIB := $(BASEDIR)/assert.rb
 MRBS := $(BASEDIR)/t/*.rb
 OBJS := driver.o $(MLIB)
 
@@ -95,7 +96,7 @@ $(MRBC) : ../src/opcode.h ../src/codegen.c ../src/parse.y
 	$(MAKE) -C ../tools/mrbc $(MAKE_FLAGS)
 
 # merge mruby sources
-$(RLIB) : $(MRBS)
+$(RLIB) : $(ASSLIB) $(MRBS)
 	cat $? > $@
 
 # clean up
diff --git a/test/assert.rb b/test/assert.rb
new file mode 100644
index 000000000..b2ce616e0
--- /dev/null
+++ b/test/assert.rb
@@ -0,0 +1,67 @@
+$ok_test = 0
+$ko_test = 0
+$kill_test = 0
+$asserts  = []
+
+##
+# Print the assertion in a readable way
+def print_assertion_string(str, iso)
+  print(str)
+  if(iso != '')
+    print(' [')
+    print(iso)
+    print(']')
+  end
+end
+
+##
+# Verify a code block.
+#
+# str : A remark which will be printed in case
+#       this assertion fails
+# iso : The ISO reference code of the feature
+#       which will be tested by this
+#       assertion
+def assert(str = 'Assertion failed', iso = '')
+  begin
+    if(!yield)
+      $asserts.push([str, iso])
+      $ko_test += 1
+      print('F')
+    else
+      $ok_test += 1
+      print('.')
+    end
+  rescue
+    $kill_test += 1
+    print('X')
+  end
+end
+
+##
+# Report the test result and print all assertions
+# which were reported broken.
+def report()
+  print "\n"
+  $asserts.each do |str, iso|
+    print('Fail: ');
+    print_assertion_string(str, iso)
+    print("\n")
+  end
+
+  $total_test = $ok_test.+($ko_test)
+  print('Total: ')
+  print($total_test)
+  print("\n")
+
+  print('  OK: ')
+  print($ok_test)
+  print("\n")
+  print('  KO: ')
+  print($ko_test)
+  print("\n")
+  print('  Crash: ')
+  print($kill_test)
+  print("\n")
+end
+
diff --git a/test/t/_assert.rb b/test/t/_assert.rb
deleted file mode 100644
index b2ce616e0..000000000
--- a/test/t/_assert.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-$ok_test = 0
-$ko_test = 0
-$kill_test = 0
-$asserts  = []
-
-##
-# Print the assertion in a readable way
-def print_assertion_string(str, iso)
-  print(str)
-  if(iso != '')
-    print(' [')
-    print(iso)
-    print(']')
-  end
-end
-
-##
-# Verify a code block.
-#
-# str : A remark which will be printed in case
-#       this assertion fails
-# iso : The ISO reference code of the feature
-#       which will be tested by this
-#       assertion
-def assert(str = 'Assertion failed', iso = '')
-  begin
-    if(!yield)
-      $asserts.push([str, iso])
-      $ko_test += 1
-      print('F')
-    else
-      $ok_test += 1
-      print('.')
-    end
-  rescue
-    $kill_test += 1
-    print('X')
-  end
-end
-
-##
-# Report the test result and print all assertions
-# which were reported broken.
-def report()
-  print "\n"
-  $asserts.each do |str, iso|
-    print('Fail: ');
-    print_assertion_string(str, iso)
-    print("\n")
-  end
-
-  $total_test = $ok_test.+($ko_test)
-  print('Total: ')
-  print($total_test)
-  print("\n")
-
-  print('  OK: ')
-  print($ok_test)
-  print("\n")
-  print('  KO: ')
-  print($ko_test)
-  print("\n")
-  print('  Crash: ')
-  print($kill_test)
-  print("\n")
-end
-
-- 
cgit v1.2.3