From ec6fd4eeca3fa468cffb25b472eb349c1fed06aa Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 Feb 2016 08:49:20 +0800 Subject: modify tests script --- tests/c++_console/src/main.cpp | 9 -- tests/c++_console/xmake.lua | 32 ------- tests/c++_shared_library/src/interface.cpp | 6 -- tests/c++_shared_library/src/interface.h | 24 ----- tests/c++_shared_library/src/test.cpp | 10 --- tests/c++_shared_library/xmake.lua | 50 ----------- tests/c++_static_library/src/interface.cpp | 6 -- tests/c++_static_library/src/interface.h | 16 ---- tests/c++_static_library/src/test.cpp | 10 --- tests/c++_static_library/xmake.lua | 50 ----------- tests/c_console/src/main.c | 7 -- tests/c_console/xmake.lua | 33 ------- tests/c_shared_library/src/interface.c | 6 -- tests/c_shared_library/src/interface.cpp | 6 -- tests/c_shared_library/src/interface.h | 24 ----- tests/c_shared_library/src/test.c | 8 -- tests/c_shared_library/src/test.cpp | 10 --- tests/c_shared_library/xmake.lua | 50 ----------- tests/c_static_library/src/interface.c | 6 -- tests/c_static_library/src/interface.h | 8 -- tests/c_static_library/src/test.c | 8 -- tests/c_static_library/xmake.lua | 50 ----------- tests/console_c++/src/main.cpp | 9 ++ tests/console_c++/xmake.lua | 32 +++++++ tests/console_c/src/main.c | 7 ++ tests/console_c/xmake.lua | 33 +++++++ tests/console_objc++/src/main.mm | 10 +++ tests/console_objc++/xmake.lua | 43 +++++++++ tests/console_objc/src/main.m | 10 +++ tests/console_objc/xmake.lua | 43 +++++++++ tests/console_swift/src/main.swift | 3 + tests/console_swift/xmake.lua | 32 +++++++ tests/interpreter/scope.lua | 13 --- tests/interpreter/tests.lua | 137 ----------------------------- tests/objc++_console/src/main.mm | 10 --- tests/objc++_console/xmake.lua | 43 --------- tests/objc_console/src/main.m | 10 --- tests/objc_console/xmake.lua | 43 --------- tests/shared_library_c++/src/interface.cpp | 6 ++ tests/shared_library_c++/src/interface.h | 24 +++++ tests/shared_library_c++/src/test.cpp | 10 +++ tests/shared_library_c++/xmake.lua | 50 +++++++++++ tests/shared_library_c/src/interface.c | 6 ++ tests/shared_library_c/src/interface.cpp | 6 ++ tests/shared_library_c/src/interface.h | 24 +++++ tests/shared_library_c/src/test.c | 8 ++ tests/shared_library_c/src/test.cpp | 10 +++ tests/shared_library_c/xmake.lua | 50 +++++++++++ tests/static_library_c++/src/interface.cpp | 6 ++ tests/static_library_c++/src/interface.h | 16 ++++ tests/static_library_c++/src/test.cpp | 10 +++ tests/static_library_c++/xmake.lua | 50 +++++++++++ tests/static_library_c/src/interface.c | 6 ++ tests/static_library_c/src/interface.h | 8 ++ tests/static_library_c/src/test.c | 8 ++ tests/static_library_c/xmake.lua | 50 +++++++++++ tests/swift_console/src/main.swift | 3 - tests/swift_console/xmake.lua | 32 ------- tests/tests | 44 ++++++--- 59 files changed, 601 insertions(+), 733 deletions(-) delete mode 100755 tests/c++_console/src/main.cpp delete mode 100755 tests/c++_console/xmake.lua delete mode 100755 tests/c++_shared_library/src/interface.cpp delete mode 100755 tests/c++_shared_library/src/interface.h delete mode 100755 tests/c++_shared_library/src/test.cpp delete mode 100755 tests/c++_shared_library/xmake.lua delete mode 100755 tests/c++_static_library/src/interface.cpp delete mode 100755 tests/c++_static_library/src/interface.h delete mode 100755 tests/c++_static_library/src/test.cpp delete mode 100755 tests/c++_static_library/xmake.lua delete mode 100755 tests/c_console/src/main.c delete mode 100755 tests/c_console/xmake.lua delete mode 100755 tests/c_shared_library/src/interface.c delete mode 100755 tests/c_shared_library/src/interface.cpp delete mode 100755 tests/c_shared_library/src/interface.h delete mode 100755 tests/c_shared_library/src/test.c delete mode 100755 tests/c_shared_library/src/test.cpp delete mode 100755 tests/c_shared_library/xmake.lua delete mode 100755 tests/c_static_library/src/interface.c delete mode 100755 tests/c_static_library/src/interface.h delete mode 100755 tests/c_static_library/src/test.c delete mode 100755 tests/c_static_library/xmake.lua create mode 100755 tests/console_c++/src/main.cpp create mode 100755 tests/console_c++/xmake.lua create mode 100755 tests/console_c/src/main.c create mode 100755 tests/console_c/xmake.lua create mode 100755 tests/console_objc++/src/main.mm create mode 100755 tests/console_objc++/xmake.lua create mode 100755 tests/console_objc/src/main.m create mode 100755 tests/console_objc/xmake.lua create mode 100755 tests/console_swift/src/main.swift create mode 100755 tests/console_swift/xmake.lua delete mode 100644 tests/interpreter/scope.lua delete mode 100644 tests/interpreter/tests.lua delete mode 100755 tests/objc++_console/src/main.mm delete mode 100755 tests/objc++_console/xmake.lua delete mode 100755 tests/objc_console/src/main.m delete mode 100755 tests/objc_console/xmake.lua create mode 100755 tests/shared_library_c++/src/interface.cpp create mode 100755 tests/shared_library_c++/src/interface.h create mode 100755 tests/shared_library_c++/src/test.cpp create mode 100755 tests/shared_library_c++/xmake.lua create mode 100755 tests/shared_library_c/src/interface.c create mode 100755 tests/shared_library_c/src/interface.cpp create mode 100755 tests/shared_library_c/src/interface.h create mode 100755 tests/shared_library_c/src/test.c create mode 100755 tests/shared_library_c/src/test.cpp create mode 100755 tests/shared_library_c/xmake.lua create mode 100755 tests/static_library_c++/src/interface.cpp create mode 100755 tests/static_library_c++/src/interface.h create mode 100755 tests/static_library_c++/src/test.cpp create mode 100755 tests/static_library_c++/xmake.lua create mode 100755 tests/static_library_c/src/interface.c create mode 100755 tests/static_library_c/src/interface.h create mode 100755 tests/static_library_c/src/test.c create mode 100755 tests/static_library_c/xmake.lua delete mode 100755 tests/swift_console/src/main.swift delete mode 100755 tests/swift_console/xmake.lua (limited to 'tests') diff --git a/tests/c++_console/src/main.cpp b/tests/c++_console/src/main.cpp deleted file mode 100755 index db2361659..000000000 --- a/tests/c++_console/src/main.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -using namespace std; - -int main(int argc, char** argv) -{ - cout << "hello world!" << endl; - return 0; -} diff --git a/tests/c++_console/xmake.lua b/tests/c++_console/xmake.lua deleted file mode 100755 index aaa5d9bb5..000000000 --- a/tests/c++_console/xmake.lua +++ /dev/null @@ -1,32 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("cpp_console") - - -- set kind - set_kind("binary") - - -- add files - add_files("src/*.cpp") - diff --git a/tests/c++_shared_library/src/interface.cpp b/tests/c++_shared_library/src/interface.cpp deleted file mode 100755 index 598d07560..000000000 --- a/tests/c++_shared_library/src/interface.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/c++_shared_library/src/interface.h b/tests/c++_shared_library/src/interface.h deleted file mode 100755 index ef24ba3ce..000000000 --- a/tests/c++_shared_library/src/interface.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) -# define __export __declspec(dllexport) -#elif defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) -# define __export __attribute__((visibility("default"))) -#else -# define __export -#endif - -/*! calculate add(a, b) - * - * @param a the first argument - * @param b the second argument - * - * @return the result - */ -__export int add(int a, int b); - -#ifdef __cplusplus -} -#endif diff --git a/tests/c++_shared_library/src/test.cpp b/tests/c++_shared_library/src/test.cpp deleted file mode 100755 index 72e03272b..000000000 --- a/tests/c++_shared_library/src/test.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "interface.h" -#include - -using namespace std; - -int main(int argc, char** argv) -{ - cout << "add(1, 2) = " << add(1, 2) << endl; - return 0; -} diff --git a/tests/c++_shared_library/xmake.lua b/tests/c++_shared_library/xmake.lua deleted file mode 100755 index 02b5c7509..000000000 --- a/tests/c++_shared_library/xmake.lua +++ /dev/null @@ -1,50 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("cpp_shared_library") - - -- set kind - set_kind("shared") - - -- add files - add_files("src/interface.cpp") - --- add target -target("test") - - -- set kind - set_kind("binary") - - -- add deps - add_deps("cpp_shared_library") - - -- add files - add_files("src/test.cpp") - - -- add links - add_links("cpp_shared_library") - - -- add link directory - add_linkdirs("$(buildir)") - diff --git a/tests/c++_static_library/src/interface.cpp b/tests/c++_static_library/src/interface.cpp deleted file mode 100755 index 598d07560..000000000 --- a/tests/c++_static_library/src/interface.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/c++_static_library/src/interface.h b/tests/c++_static_library/src/interface.h deleted file mode 100755 index 4a41e9597..000000000 --- a/tests/c++_static_library/src/interface.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef __cplusplus -extern "C" { -#endif - -/*! calculate add(a, b) - * - * @param a the first argument - * @param b the second argument - * - * @return the result - */ -int add(int a, int b); - -#ifdef __cplusplus -} -#endif diff --git a/tests/c++_static_library/src/test.cpp b/tests/c++_static_library/src/test.cpp deleted file mode 100755 index 72e03272b..000000000 --- a/tests/c++_static_library/src/test.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "interface.h" -#include - -using namespace std; - -int main(int argc, char** argv) -{ - cout << "add(1, 2) = " << add(1, 2) << endl; - return 0; -} diff --git a/tests/c++_static_library/xmake.lua b/tests/c++_static_library/xmake.lua deleted file mode 100755 index c57927a5d..000000000 --- a/tests/c++_static_library/xmake.lua +++ /dev/null @@ -1,50 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("cpp_static_library") - - -- set kind - set_kind("static") - - -- add files - add_files("src/interface.cpp") - --- add target -target("test") - - -- set kind - set_kind("binary") - - -- add deps - add_deps("cpp_static_library") - - -- add files - add_files("src/test.cpp") - - -- add links - add_links("cpp_static_library") - - -- add link directory - add_linkdirs("$(buildir)") - diff --git a/tests/c_console/src/main.c b/tests/c_console/src/main.c deleted file mode 100755 index 9ae580511..000000000 --- a/tests/c_console/src/main.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(int argc, char** argv) -{ - printf("hello world!\n"); - return 0; -} diff --git a/tests/c_console/xmake.lua b/tests/c_console/xmake.lua deleted file mode 100755 index 889055a4d..000000000 --- a/tests/c_console/xmake.lua +++ /dev/null @@ -1,33 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("c_console") - - -- set kind - set_kind("binary") - - -- add files - add_files("src/*.c") - - diff --git a/tests/c_shared_library/src/interface.c b/tests/c_shared_library/src/interface.c deleted file mode 100755 index 598d07560..000000000 --- a/tests/c_shared_library/src/interface.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/c_shared_library/src/interface.cpp b/tests/c_shared_library/src/interface.cpp deleted file mode 100755 index 598d07560..000000000 --- a/tests/c_shared_library/src/interface.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/c_shared_library/src/interface.h b/tests/c_shared_library/src/interface.h deleted file mode 100755 index ef24ba3ce..000000000 --- a/tests/c_shared_library/src/interface.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) -# define __export __declspec(dllexport) -#elif defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) -# define __export __attribute__((visibility("default"))) -#else -# define __export -#endif - -/*! calculate add(a, b) - * - * @param a the first argument - * @param b the second argument - * - * @return the result - */ -__export int add(int a, int b); - -#ifdef __cplusplus -} -#endif diff --git a/tests/c_shared_library/src/test.c b/tests/c_shared_library/src/test.c deleted file mode 100755 index 9505a2f75..000000000 --- a/tests/c_shared_library/src/test.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "interface.h" -#include - -int main(int argc, char** argv) -{ - printf("add(1, 2) = %d\n", add(1, 2)); - return 0; -} diff --git a/tests/c_shared_library/src/test.cpp b/tests/c_shared_library/src/test.cpp deleted file mode 100755 index 72e03272b..000000000 --- a/tests/c_shared_library/src/test.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "interface.h" -#include - -using namespace std; - -int main(int argc, char** argv) -{ - cout << "add(1, 2) = " << add(1, 2) << endl; - return 0; -} diff --git a/tests/c_shared_library/xmake.lua b/tests/c_shared_library/xmake.lua deleted file mode 100755 index d357b72f3..000000000 --- a/tests/c_shared_library/xmake.lua +++ /dev/null @@ -1,50 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("c_shared_library") - - -- set kind - set_kind("shared") - - -- add files - add_files("src/interface.cpp") - --- add target -target("test") - - -- set kind - set_kind("binary") - - -- add deps - add_deps("c_shared_library") - - -- add files - add_files("src/test.cpp") - - -- add links - add_links("c_shared_library") - - -- add link directory - add_linkdirs("$(buildir)") - diff --git a/tests/c_static_library/src/interface.c b/tests/c_static_library/src/interface.c deleted file mode 100755 index 598d07560..000000000 --- a/tests/c_static_library/src/interface.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/c_static_library/src/interface.h b/tests/c_static_library/src/interface.h deleted file mode 100755 index 10ec0f856..000000000 --- a/tests/c_static_library/src/interface.h +++ /dev/null @@ -1,8 +0,0 @@ -/*! calculate add(a, b) - * - * @param a the first argument - * @param b the second argument - * - * @return the result - */ -int add(int a, int b); diff --git a/tests/c_static_library/src/test.c b/tests/c_static_library/src/test.c deleted file mode 100755 index 9505a2f75..000000000 --- a/tests/c_static_library/src/test.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "interface.h" -#include - -int main(int argc, char** argv) -{ - printf("add(1, 2) = %d\n", add(1, 2)); - return 0; -} diff --git a/tests/c_static_library/xmake.lua b/tests/c_static_library/xmake.lua deleted file mode 100755 index 72fd8c4a0..000000000 --- a/tests/c_static_library/xmake.lua +++ /dev/null @@ -1,50 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("c_static_library") - - -- set kind - set_kind("static") - - -- add files - add_files("src/interface.c") - --- add target -target("test") - - -- set kind - set_kind("binary") - - -- add deps - add_deps("c_static_library") - - -- add files - add_files("src/test.c") - - -- add links - add_links("c_static_library") - - -- add link directory - add_linkdirs("$(buildir)") - diff --git a/tests/console_c++/src/main.cpp b/tests/console_c++/src/main.cpp new file mode 100755 index 000000000..db2361659 --- /dev/null +++ b/tests/console_c++/src/main.cpp @@ -0,0 +1,9 @@ +#include + +using namespace std; + +int main(int argc, char** argv) +{ + cout << "hello world!" << endl; + return 0; +} diff --git a/tests/console_c++/xmake.lua b/tests/console_c++/xmake.lua new file mode 100755 index 000000000..aaa5d9bb5 --- /dev/null +++ b/tests/console_c++/xmake.lua @@ -0,0 +1,32 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("cpp_console") + + -- set kind + set_kind("binary") + + -- add files + add_files("src/*.cpp") + diff --git a/tests/console_c/src/main.c b/tests/console_c/src/main.c new file mode 100755 index 000000000..9ae580511 --- /dev/null +++ b/tests/console_c/src/main.c @@ -0,0 +1,7 @@ +#include + +int main(int argc, char** argv) +{ + printf("hello world!\n"); + return 0; +} diff --git a/tests/console_c/xmake.lua b/tests/console_c/xmake.lua new file mode 100755 index 000000000..889055a4d --- /dev/null +++ b/tests/console_c/xmake.lua @@ -0,0 +1,33 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("c_console") + + -- set kind + set_kind("binary") + + -- add files + add_files("src/*.c") + + diff --git a/tests/console_objc++/src/main.mm b/tests/console_objc++/src/main.mm new file mode 100755 index 000000000..61a3f5875 --- /dev/null +++ b/tests/console_objc++/src/main.mm @@ -0,0 +1,10 @@ +#import + +int main(int argc, char** argv) +{ + @autoreleasepool + { + NSLog(@"hello world!"); + } + return 0; +} diff --git a/tests/console_objc++/xmake.lua b/tests/console_objc++/xmake.lua new file mode 100755 index 000000000..ab706d51a --- /dev/null +++ b/tests/console_objc++/xmake.lua @@ -0,0 +1,43 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- for macosx or ios +if os("macosx", "ios") then + + -- add framework + add_mxflags("-framework Foundation", "-framework CoreFoundation") + add_ldflags("-framework Foundation", "-framework CoreFoundation") + + -- enable arc? + add_mxflags("-fobjc-arc") +end + +-- add target +target("objcpp_console") + + -- set kind + set_kind("binary") + + -- add files + add_files("src/*.mm") + diff --git a/tests/console_objc/src/main.m b/tests/console_objc/src/main.m new file mode 100755 index 000000000..61a3f5875 --- /dev/null +++ b/tests/console_objc/src/main.m @@ -0,0 +1,10 @@ +#import + +int main(int argc, char** argv) +{ + @autoreleasepool + { + NSLog(@"hello world!"); + } + return 0; +} diff --git a/tests/console_objc/xmake.lua b/tests/console_objc/xmake.lua new file mode 100755 index 000000000..ca5310578 --- /dev/null +++ b/tests/console_objc/xmake.lua @@ -0,0 +1,43 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- for macosx or ios +if os("macosx", "ios") then + + -- add framework + add_mxflags("-framework Foundation", "-framework CoreFoundation") + add_ldflags("-framework Foundation", "-framework CoreFoundation") + + -- enable arc? + add_mxflags("-fobjc-arc") +end + +-- add target +target("objc_console") + + -- set kind + set_kind("binary") + + -- add files + add_files("src/*.m") + diff --git a/tests/console_swift/src/main.swift b/tests/console_swift/src/main.swift new file mode 100755 index 000000000..ee21045f4 --- /dev/null +++ b/tests/console_swift/src/main.swift @@ -0,0 +1,3 @@ +import Foundation + +print("hello world!") diff --git a/tests/console_swift/xmake.lua b/tests/console_swift/xmake.lua new file mode 100755 index 000000000..68f822d8f --- /dev/null +++ b/tests/console_swift/xmake.lua @@ -0,0 +1,32 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("swift_console") + + -- set kind + set_kind("binary") + + -- add files + add_files("src/*.swift") + diff --git a/tests/interpreter/scope.lua b/tests/interpreter/scope.lua deleted file mode 100644 index ae64c2370..000000000 --- a/tests/interpreter/scope.lua +++ /dev/null @@ -1,13 +0,0 @@ - -set_kind("static") -add_files("root.c") - -target("target1") - - set_kind("static") - add_files("*.c", "hello.c") - add_files("$(projectdir)/test.c") - -option("option1") - - add_option_links("pthread", "z") diff --git a/tests/interpreter/tests.lua b/tests/interpreter/tests.lua deleted file mode 100644 index 8f6be802b..000000000 --- a/tests/interpreter/tests.lua +++ /dev/null @@ -1,137 +0,0 @@ ---!The Automatic Cross-platform Build Tool --- --- XMake is free software; you can redistribute it and/or modify --- it under the terms of the GNU Lesser General Public License as published by --- the Free Software Foundation; either version 2.1 of the License, or --- (at your option) any later version. --- --- XMake is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU Lesser General Public License for more details. --- --- You should have received a copy of the GNU Lesser General Public License --- along with XMake; --- If not, see http://www.gnu.org/licenses/ --- --- Copyright (C) 2009 - 2015, ruki All rights reserved. --- --- @author ruki --- @file tests.lua --- - --- define module: tests -local tests = tests or {} - --- load modules -local utils = require("base/utils") -local interpreter = require("base/interpreter") - --- the main function -function tests.main(self, file) - - -- check - assert(file and #file == 1) - - -- init interpreter - local interp = interpreter.init() - assert(interp) - - -- set root directory - interp:rootdir_set(xmake._PROJECT_DIR) - - -- register api for scopes - interp:api_register_set_scope("target", "option") - interp:api_register_add_scope("target", "option") - - -- register api for values - interp:api_register_set_values("target", nil, "kind" - , "config_h_prefix" - , "version" - , "strip" - , "is_option" - , "symbols" - , "warnings" - , "optimize" - , "languages" - , "runscript" - , "installscript" - , "packagescript") - interp:api_register_add_values("target", nil, "deps" - , "links" - , "cflags" - , "cxflags" - , "cxxflags" - , "mflags" - , "mxflags" - , "mxxflags" - , "ldflags" - , "shflags" - , "is_option" - , "defines" - , "undefines" - , "defines_h" - , "undefines_h" - , "languages" - , "vectorexts") - interp:api_register_set_pathes("target", nil, "headerdir" - , "targetdir" - , "objectdir" - , "config_h") - interp:api_register_add_pathes("target", nil, "files" - , "headers" - , "linkdirs" - , "includedirs") - - - interp:api_register_set_values("option", "option", "enable" - , "showmenu" - , "category" - , "warnings" - , "optimize" - , "languages" - , "description") - interp:api_register_add_values("option", "option", "links" - , "cincludes" - , "cxxincludes" - , "cfuncs" - , "cxxfuncs" - , "ctypes" - , "cxxtypes" - , "cflags" - , "cxflags" - , "cxxflags" - , "ldflags" - , "vectorexts" - , "defines" - , "defines_if_ok" - , "defines_h_if_ok" - , "undefines" - , "undefines_if_ok" - , "undefines_h_if_ok") - interp:api_register_add_pathes("option", "option", "linkdirs" - , "includedirs") - - -- set filter - interp:filter_set(function (variable) - if variable == "projectdir" then - return xmake._PROJECT_DIR - end - end) - - -- load targets - local targets, errors = interp:load(file[1], "target", true, true) - if not targets then - print(errors) - return false - end - - -- dump targets - utils.dump(targets) - - -- ok - return true -end - --- return module: tests -return tests diff --git a/tests/objc++_console/src/main.mm b/tests/objc++_console/src/main.mm deleted file mode 100755 index 61a3f5875..000000000 --- a/tests/objc++_console/src/main.mm +++ /dev/null @@ -1,10 +0,0 @@ -#import - -int main(int argc, char** argv) -{ - @autoreleasepool - { - NSLog(@"hello world!"); - } - return 0; -} diff --git a/tests/objc++_console/xmake.lua b/tests/objc++_console/xmake.lua deleted file mode 100755 index ab706d51a..000000000 --- a/tests/objc++_console/xmake.lua +++ /dev/null @@ -1,43 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- for macosx or ios -if os("macosx", "ios") then - - -- add framework - add_mxflags("-framework Foundation", "-framework CoreFoundation") - add_ldflags("-framework Foundation", "-framework CoreFoundation") - - -- enable arc? - add_mxflags("-fobjc-arc") -end - --- add target -target("objcpp_console") - - -- set kind - set_kind("binary") - - -- add files - add_files("src/*.mm") - diff --git a/tests/objc_console/src/main.m b/tests/objc_console/src/main.m deleted file mode 100755 index 61a3f5875..000000000 --- a/tests/objc_console/src/main.m +++ /dev/null @@ -1,10 +0,0 @@ -#import - -int main(int argc, char** argv) -{ - @autoreleasepool - { - NSLog(@"hello world!"); - } - return 0; -} diff --git a/tests/objc_console/xmake.lua b/tests/objc_console/xmake.lua deleted file mode 100755 index ca5310578..000000000 --- a/tests/objc_console/xmake.lua +++ /dev/null @@ -1,43 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- for macosx or ios -if os("macosx", "ios") then - - -- add framework - add_mxflags("-framework Foundation", "-framework CoreFoundation") - add_ldflags("-framework Foundation", "-framework CoreFoundation") - - -- enable arc? - add_mxflags("-fobjc-arc") -end - --- add target -target("objc_console") - - -- set kind - set_kind("binary") - - -- add files - add_files("src/*.m") - diff --git a/tests/shared_library_c++/src/interface.cpp b/tests/shared_library_c++/src/interface.cpp new file mode 100755 index 000000000..598d07560 --- /dev/null +++ b/tests/shared_library_c++/src/interface.cpp @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/shared_library_c++/src/interface.h b/tests/shared_library_c++/src/interface.h new file mode 100755 index 000000000..ef24ba3ce --- /dev/null +++ b/tests/shared_library_c++/src/interface.h @@ -0,0 +1,24 @@ +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(_WIN32) +# define __export __declspec(dllexport) +#elif defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +# define __export __attribute__((visibility("default"))) +#else +# define __export +#endif + +/*! calculate add(a, b) + * + * @param a the first argument + * @param b the second argument + * + * @return the result + */ +__export int add(int a, int b); + +#ifdef __cplusplus +} +#endif diff --git a/tests/shared_library_c++/src/test.cpp b/tests/shared_library_c++/src/test.cpp new file mode 100755 index 000000000..72e03272b --- /dev/null +++ b/tests/shared_library_c++/src/test.cpp @@ -0,0 +1,10 @@ +#include "interface.h" +#include + +using namespace std; + +int main(int argc, char** argv) +{ + cout << "add(1, 2) = " << add(1, 2) << endl; + return 0; +} diff --git a/tests/shared_library_c++/xmake.lua b/tests/shared_library_c++/xmake.lua new file mode 100755 index 000000000..02b5c7509 --- /dev/null +++ b/tests/shared_library_c++/xmake.lua @@ -0,0 +1,50 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("cpp_shared_library") + + -- set kind + set_kind("shared") + + -- add files + add_files("src/interface.cpp") + +-- add target +target("test") + + -- set kind + set_kind("binary") + + -- add deps + add_deps("cpp_shared_library") + + -- add files + add_files("src/test.cpp") + + -- add links + add_links("cpp_shared_library") + + -- add link directory + add_linkdirs("$(buildir)") + diff --git a/tests/shared_library_c/src/interface.c b/tests/shared_library_c/src/interface.c new file mode 100755 index 000000000..598d07560 --- /dev/null +++ b/tests/shared_library_c/src/interface.c @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/shared_library_c/src/interface.cpp b/tests/shared_library_c/src/interface.cpp new file mode 100755 index 000000000..598d07560 --- /dev/null +++ b/tests/shared_library_c/src/interface.cpp @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/shared_library_c/src/interface.h b/tests/shared_library_c/src/interface.h new file mode 100755 index 000000000..ef24ba3ce --- /dev/null +++ b/tests/shared_library_c/src/interface.h @@ -0,0 +1,24 @@ +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(_WIN32) +# define __export __declspec(dllexport) +#elif defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +# define __export __attribute__((visibility("default"))) +#else +# define __export +#endif + +/*! calculate add(a, b) + * + * @param a the first argument + * @param b the second argument + * + * @return the result + */ +__export int add(int a, int b); + +#ifdef __cplusplus +} +#endif diff --git a/tests/shared_library_c/src/test.c b/tests/shared_library_c/src/test.c new file mode 100755 index 000000000..9505a2f75 --- /dev/null +++ b/tests/shared_library_c/src/test.c @@ -0,0 +1,8 @@ +#include "interface.h" +#include + +int main(int argc, char** argv) +{ + printf("add(1, 2) = %d\n", add(1, 2)); + return 0; +} diff --git a/tests/shared_library_c/src/test.cpp b/tests/shared_library_c/src/test.cpp new file mode 100755 index 000000000..72e03272b --- /dev/null +++ b/tests/shared_library_c/src/test.cpp @@ -0,0 +1,10 @@ +#include "interface.h" +#include + +using namespace std; + +int main(int argc, char** argv) +{ + cout << "add(1, 2) = " << add(1, 2) << endl; + return 0; +} diff --git a/tests/shared_library_c/xmake.lua b/tests/shared_library_c/xmake.lua new file mode 100755 index 000000000..d357b72f3 --- /dev/null +++ b/tests/shared_library_c/xmake.lua @@ -0,0 +1,50 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("c_shared_library") + + -- set kind + set_kind("shared") + + -- add files + add_files("src/interface.cpp") + +-- add target +target("test") + + -- set kind + set_kind("binary") + + -- add deps + add_deps("c_shared_library") + + -- add files + add_files("src/test.cpp") + + -- add links + add_links("c_shared_library") + + -- add link directory + add_linkdirs("$(buildir)") + diff --git a/tests/static_library_c++/src/interface.cpp b/tests/static_library_c++/src/interface.cpp new file mode 100755 index 000000000..598d07560 --- /dev/null +++ b/tests/static_library_c++/src/interface.cpp @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/static_library_c++/src/interface.h b/tests/static_library_c++/src/interface.h new file mode 100755 index 000000000..4a41e9597 --- /dev/null +++ b/tests/static_library_c++/src/interface.h @@ -0,0 +1,16 @@ +#ifdef __cplusplus +extern "C" { +#endif + +/*! calculate add(a, b) + * + * @param a the first argument + * @param b the second argument + * + * @return the result + */ +int add(int a, int b); + +#ifdef __cplusplus +} +#endif diff --git a/tests/static_library_c++/src/test.cpp b/tests/static_library_c++/src/test.cpp new file mode 100755 index 000000000..72e03272b --- /dev/null +++ b/tests/static_library_c++/src/test.cpp @@ -0,0 +1,10 @@ +#include "interface.h" +#include + +using namespace std; + +int main(int argc, char** argv) +{ + cout << "add(1, 2) = " << add(1, 2) << endl; + return 0; +} diff --git a/tests/static_library_c++/xmake.lua b/tests/static_library_c++/xmake.lua new file mode 100755 index 000000000..c57927a5d --- /dev/null +++ b/tests/static_library_c++/xmake.lua @@ -0,0 +1,50 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("cpp_static_library") + + -- set kind + set_kind("static") + + -- add files + add_files("src/interface.cpp") + +-- add target +target("test") + + -- set kind + set_kind("binary") + + -- add deps + add_deps("cpp_static_library") + + -- add files + add_files("src/test.cpp") + + -- add links + add_links("cpp_static_library") + + -- add link directory + add_linkdirs("$(buildir)") + diff --git a/tests/static_library_c/src/interface.c b/tests/static_library_c/src/interface.c new file mode 100755 index 000000000..598d07560 --- /dev/null +++ b/tests/static_library_c/src/interface.c @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/static_library_c/src/interface.h b/tests/static_library_c/src/interface.h new file mode 100755 index 000000000..10ec0f856 --- /dev/null +++ b/tests/static_library_c/src/interface.h @@ -0,0 +1,8 @@ +/*! calculate add(a, b) + * + * @param a the first argument + * @param b the second argument + * + * @return the result + */ +int add(int a, int b); diff --git a/tests/static_library_c/src/test.c b/tests/static_library_c/src/test.c new file mode 100755 index 000000000..9505a2f75 --- /dev/null +++ b/tests/static_library_c/src/test.c @@ -0,0 +1,8 @@ +#include "interface.h" +#include + +int main(int argc, char** argv) +{ + printf("add(1, 2) = %d\n", add(1, 2)); + return 0; +} diff --git a/tests/static_library_c/xmake.lua b/tests/static_library_c/xmake.lua new file mode 100755 index 000000000..72fd8c4a0 --- /dev/null +++ b/tests/static_library_c/xmake.lua @@ -0,0 +1,50 @@ +-- the debug mode +if is_mode("debug") then + + -- enable the debug symbols + set_symbols("debug") + + -- disable optimization + set_optimize("none") +end + +-- the release mode +if is_mode("release") then + + -- set the symbols visibility: hidden + set_symbols("hidden") + + -- enable fastest optimization + set_optimize("fastest") + + -- strip all symbols + set_strip("all") +end + +-- add target +target("c_static_library") + + -- set kind + set_kind("static") + + -- add files + add_files("src/interface.c") + +-- add target +target("test") + + -- set kind + set_kind("binary") + + -- add deps + add_deps("c_static_library") + + -- add files + add_files("src/test.c") + + -- add links + add_links("c_static_library") + + -- add link directory + add_linkdirs("$(buildir)") + diff --git a/tests/swift_console/src/main.swift b/tests/swift_console/src/main.swift deleted file mode 100755 index ee21045f4..000000000 --- a/tests/swift_console/src/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -import Foundation - -print("hello world!") diff --git a/tests/swift_console/xmake.lua b/tests/swift_console/xmake.lua deleted file mode 100755 index 68f822d8f..000000000 --- a/tests/swift_console/xmake.lua +++ /dev/null @@ -1,32 +0,0 @@ --- the debug mode -if is_mode("debug") then - - -- enable the debug symbols - set_symbols("debug") - - -- disable optimization - set_optimize("none") -end - --- the release mode -if is_mode("release") then - - -- set the symbols visibility: hidden - set_symbols("hidden") - - -- enable fastest optimization - set_optimize("fastest") - - -- strip all symbols - set_strip("all") -end - --- add target -target("swift_console") - - -- set kind - set_kind("binary") - - -- add files - add_files("src/*.swift") - diff --git a/tests/tests b/tests/tests index 40578593a..f827ed82d 100755 --- a/tests/tests +++ b/tests/tests @@ -1,28 +1,46 @@ #!/bin/bash +verbose=$1 +host=linux +if [ `uname` = "Darwin" ] || [ `uname | egrep -i darwin` ]; then + host=macosx +fi + function exec() { echo $1 - eval $1 $2 + eval $1 $verbose if [ $? -ne 0 ] then exit fi echo "" } -verbose=$1 +function build() +{ + exec "xmake -r -P $1" + + if [ $host = "macosx" ]; then + + exec "xmake f -p iphoneos -P $1" + exec "xmake -r -P $1" + + exec "xmake f -p iphonesimulator -P $1" + exec "xmake -r -P $1" + fi +} + +build "./tests/console_c" +build "./tests/static_library_c" +build "./tests/shared_library_c" -exec "xmake -r -P ./tests/c_console" $verbose -exec "xmake -r -P ./tests/c_static_library" $verbose -exec "xmake -r -P ./tests/c_shared_library" $verbose +build "./tests/console_c++" +build "./tests/static_library_c++" +build "./tests/shared_library_c++" -exec "xmake -r -P ./tests/c++_console" $verbose -exec "xmake -r -P ./tests/c++_static_library" $verbose -exec "xmake -r -P ./tests/c++_shared_library" $verbose +if [ $host = "macosx" ]; then -uname=`uname` -if [ $uname = "Darwin" ] || [ `uname | egrep -i darwin` ]; then - exec "xmake -r -P ./tests/objc_console" $verbose - exec "xmake -r -P ./tests/objc++_console" $verbose - exec "xmake -r -P ./tests/swift_console" $verbose + build "./tests/console_objc" + build "./tests/console_objc++" + build "./tests/console_swift" fi -- cgit v1.3.1