From 18379e15998e96ca604c10adc6295cc4b89ae8e4 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 6 Aug 2013 05:39:19 +0200 Subject: Updating Balau and Dalos-modules, and adding a few Lua tests for Dalos-cli. --- Balau | 2 +- Dalos-modules | 2 +- Makefile | 4 +++- tests/alltests.lua | 5 +++++ tests/load-test.lua | 1 + tests/runtests.lua | 1 + tests/test1.lua | 3 +++ 7 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/alltests.lua create mode 100644 tests/load-test.lua create mode 100644 tests/runtests.lua create mode 100644 tests/test1.lua diff --git a/Balau b/Balau index cd5da60..1a67500 160000 --- a/Balau +++ b/Balau @@ -1 +1 @@ -Subproject commit cd5da6097812baf125c2dc4f1d12e1a3f4985464 +Subproject commit 1a67500d100520dd8be9856f2f57ab8b0fbf90bb diff --git a/Dalos-modules b/Dalos-modules index 3c10400..da30e78 160000 --- a/Dalos-modules +++ b/Dalos-modules @@ -1 +1 @@ -Subproject commit 3c1040007a354ce55bd964beabac94b67c1f6fc7 +Subproject commit da30e788fea8391efecc648ae0efc8db665a1a02 diff --git a/Makefile b/Makefile index 09cc5d6..c91cdec 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,10 @@ strip: $(TARGET) Balau: $(MAKE) -C Balau -tests: +tests: $(TARGET) $(MAKE) -C Balau tests + ./$(TARGET) tests/alltests.lua tests/runtests.lua + ./$(TARGET) tests/alltests.lua -e 'runtests()' Balau/libBalau.a: $(MAKE) -C Balau diff --git a/tests/alltests.lua b/tests/alltests.lua new file mode 100644 index 0000000..d0feda2 --- /dev/null +++ b/tests/alltests.lua @@ -0,0 +1,5 @@ +load "tests/test1.lua" + +function runtests() + test1() +end diff --git a/tests/load-test.lua b/tests/load-test.lua new file mode 100644 index 0000000..9700e50 --- /dev/null +++ b/tests/load-test.lua @@ -0,0 +1 @@ +print "in load-test.lua" diff --git a/tests/runtests.lua b/tests/runtests.lua new file mode 100644 index 0000000..f37e71a --- /dev/null +++ b/tests/runtests.lua @@ -0,0 +1 @@ +runtests() diff --git a/tests/test1.lua b/tests/test1.lua new file mode 100644 index 0000000..bc42fd9 --- /dev/null +++ b/tests/test1.lua @@ -0,0 +1,3 @@ +function test1() + load "tests/load-test.lua" +end -- cgit v1.2.3