summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xtests/console_c++/src/main.cpp (renamed from tests/c++_console/src/main.cpp)0
-rwxr-xr-xtests/console_c++/xmake.lua (renamed from tests/c++_console/xmake.lua)0
-rwxr-xr-xtests/console_c/src/main.c (renamed from tests/c_console/src/main.c)0
-rwxr-xr-xtests/console_c/xmake.lua (renamed from tests/c_console/xmake.lua)0
-rwxr-xr-xtests/console_objc++/src/main.mm (renamed from tests/objc++_console/src/main.mm)0
-rwxr-xr-xtests/console_objc++/xmake.lua (renamed from tests/objc++_console/xmake.lua)0
-rwxr-xr-xtests/console_objc/src/main.m (renamed from tests/objc_console/src/main.m)0
-rwxr-xr-xtests/console_objc/xmake.lua (renamed from tests/objc_console/xmake.lua)0
-rwxr-xr-xtests/console_swift/src/main.swift (renamed from tests/swift_console/src/main.swift)0
-rwxr-xr-xtests/console_swift/xmake.lua (renamed from tests/swift_console/xmake.lua)0
-rw-r--r--tests/interpreter/scope.lua13
-rw-r--r--tests/interpreter/tests.lua137
-rwxr-xr-xtests/shared_library_c++/src/interface.cpp (renamed from tests/c++_shared_library/src/interface.cpp)0
-rwxr-xr-xtests/shared_library_c++/src/interface.h (renamed from tests/c++_shared_library/src/interface.h)0
-rwxr-xr-xtests/shared_library_c++/src/test.cpp (renamed from tests/c++_shared_library/src/test.cpp)0
-rwxr-xr-xtests/shared_library_c++/xmake.lua (renamed from tests/c++_shared_library/xmake.lua)0
-rwxr-xr-xtests/shared_library_c/src/interface.c (renamed from tests/c_shared_library/src/interface.c)0
-rwxr-xr-xtests/shared_library_c/src/interface.cpp (renamed from tests/c++_static_library/src/interface.cpp)0
-rwxr-xr-xtests/shared_library_c/src/interface.h (renamed from tests/c_shared_library/src/interface.h)0
-rwxr-xr-xtests/shared_library_c/src/test.c (renamed from tests/c_shared_library/src/test.c)0
-rwxr-xr-xtests/shared_library_c/src/test.cpp (renamed from tests/c++_static_library/src/test.cpp)0
-rwxr-xr-xtests/shared_library_c/xmake.lua (renamed from tests/c_shared_library/xmake.lua)0
-rwxr-xr-xtests/static_library_c++/src/interface.cpp (renamed from tests/c_shared_library/src/interface.cpp)0
-rwxr-xr-xtests/static_library_c++/src/interface.h (renamed from tests/c++_static_library/src/interface.h)0
-rwxr-xr-xtests/static_library_c++/src/test.cpp (renamed from tests/c_shared_library/src/test.cpp)0
-rwxr-xr-xtests/static_library_c++/xmake.lua (renamed from tests/c++_static_library/xmake.lua)0
-rwxr-xr-xtests/static_library_c/src/interface.c (renamed from tests/c_static_library/src/interface.c)0
-rwxr-xr-xtests/static_library_c/src/interface.h (renamed from tests/c_static_library/src/interface.h)0
-rwxr-xr-xtests/static_library_c/src/test.c (renamed from tests/c_static_library/src/test.c)0
-rwxr-xr-xtests/static_library_c/xmake.lua (renamed from tests/c_static_library/xmake.lua)0
-rwxr-xr-xtests/tests44
31 files changed, 31 insertions, 163 deletions
diff --git a/tests/c++_console/src/main.cpp b/tests/console_c++/src/main.cpp
index db2361659..db2361659 100755
--- a/tests/c++_console/src/main.cpp
+++ b/tests/console_c++/src/main.cpp
diff --git a/tests/c++_console/xmake.lua b/tests/console_c++/xmake.lua
index aaa5d9bb5..aaa5d9bb5 100755
--- a/tests/c++_console/xmake.lua
+++ b/tests/console_c++/xmake.lua
diff --git a/tests/c_console/src/main.c b/tests/console_c/src/main.c
index 9ae580511..9ae580511 100755
--- a/tests/c_console/src/main.c
+++ b/tests/console_c/src/main.c
diff --git a/tests/c_console/xmake.lua b/tests/console_c/xmake.lua
index 889055a4d..889055a4d 100755
--- a/tests/c_console/xmake.lua
+++ b/tests/console_c/xmake.lua
diff --git a/tests/objc++_console/src/main.mm b/tests/console_objc++/src/main.mm
index 61a3f5875..61a3f5875 100755
--- a/tests/objc++_console/src/main.mm
+++ b/tests/console_objc++/src/main.mm
diff --git a/tests/objc++_console/xmake.lua b/tests/console_objc++/xmake.lua
index ab706d51a..ab706d51a 100755
--- a/tests/objc++_console/xmake.lua
+++ b/tests/console_objc++/xmake.lua
diff --git a/tests/objc_console/src/main.m b/tests/console_objc/src/main.m
index 61a3f5875..61a3f5875 100755
--- a/tests/objc_console/src/main.m
+++ b/tests/console_objc/src/main.m
diff --git a/tests/objc_console/xmake.lua b/tests/console_objc/xmake.lua
index ca5310578..ca5310578 100755
--- a/tests/objc_console/xmake.lua
+++ b/tests/console_objc/xmake.lua
diff --git a/tests/swift_console/src/main.swift b/tests/console_swift/src/main.swift
index ee21045f4..ee21045f4 100755
--- a/tests/swift_console/src/main.swift
+++ b/tests/console_swift/src/main.swift
diff --git a/tests/swift_console/xmake.lua b/tests/console_swift/xmake.lua
index 68f822d8f..68f822d8f 100755
--- a/tests/swift_console/xmake.lua
+++ b/tests/console_swift/xmake.lua
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 <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
---
--- 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/c++_shared_library/src/interface.cpp b/tests/shared_library_c++/src/interface.cpp
index 598d07560..598d07560 100755
--- a/tests/c++_shared_library/src/interface.cpp
+++ b/tests/shared_library_c++/src/interface.cpp
diff --git a/tests/c++_shared_library/src/interface.h b/tests/shared_library_c++/src/interface.h
index ef24ba3ce..ef24ba3ce 100755
--- a/tests/c++_shared_library/src/interface.h
+++ b/tests/shared_library_c++/src/interface.h
diff --git a/tests/c++_shared_library/src/test.cpp b/tests/shared_library_c++/src/test.cpp
index 72e03272b..72e03272b 100755
--- a/tests/c++_shared_library/src/test.cpp
+++ b/tests/shared_library_c++/src/test.cpp
diff --git a/tests/c++_shared_library/xmake.lua b/tests/shared_library_c++/xmake.lua
index 02b5c7509..02b5c7509 100755
--- a/tests/c++_shared_library/xmake.lua
+++ b/tests/shared_library_c++/xmake.lua
diff --git a/tests/c_shared_library/src/interface.c b/tests/shared_library_c/src/interface.c
index 598d07560..598d07560 100755
--- a/tests/c_shared_library/src/interface.c
+++ b/tests/shared_library_c/src/interface.c
diff --git a/tests/c++_static_library/src/interface.cpp b/tests/shared_library_c/src/interface.cpp
index 598d07560..598d07560 100755
--- a/tests/c++_static_library/src/interface.cpp
+++ b/tests/shared_library_c/src/interface.cpp
diff --git a/tests/c_shared_library/src/interface.h b/tests/shared_library_c/src/interface.h
index ef24ba3ce..ef24ba3ce 100755
--- a/tests/c_shared_library/src/interface.h
+++ b/tests/shared_library_c/src/interface.h
diff --git a/tests/c_shared_library/src/test.c b/tests/shared_library_c/src/test.c
index 9505a2f75..9505a2f75 100755
--- a/tests/c_shared_library/src/test.c
+++ b/tests/shared_library_c/src/test.c
diff --git a/tests/c++_static_library/src/test.cpp b/tests/shared_library_c/src/test.cpp
index 72e03272b..72e03272b 100755
--- a/tests/c++_static_library/src/test.cpp
+++ b/tests/shared_library_c/src/test.cpp
diff --git a/tests/c_shared_library/xmake.lua b/tests/shared_library_c/xmake.lua
index d357b72f3..d357b72f3 100755
--- a/tests/c_shared_library/xmake.lua
+++ b/tests/shared_library_c/xmake.lua
diff --git a/tests/c_shared_library/src/interface.cpp b/tests/static_library_c++/src/interface.cpp
index 598d07560..598d07560 100755
--- a/tests/c_shared_library/src/interface.cpp
+++ b/tests/static_library_c++/src/interface.cpp
diff --git a/tests/c++_static_library/src/interface.h b/tests/static_library_c++/src/interface.h
index 4a41e9597..4a41e9597 100755
--- a/tests/c++_static_library/src/interface.h
+++ b/tests/static_library_c++/src/interface.h
diff --git a/tests/c_shared_library/src/test.cpp b/tests/static_library_c++/src/test.cpp
index 72e03272b..72e03272b 100755
--- a/tests/c_shared_library/src/test.cpp
+++ b/tests/static_library_c++/src/test.cpp
diff --git a/tests/c++_static_library/xmake.lua b/tests/static_library_c++/xmake.lua
index c57927a5d..c57927a5d 100755
--- a/tests/c++_static_library/xmake.lua
+++ b/tests/static_library_c++/xmake.lua
diff --git a/tests/c_static_library/src/interface.c b/tests/static_library_c/src/interface.c
index 598d07560..598d07560 100755
--- a/tests/c_static_library/src/interface.c
+++ b/tests/static_library_c/src/interface.c
diff --git a/tests/c_static_library/src/interface.h b/tests/static_library_c/src/interface.h
index 10ec0f856..10ec0f856 100755
--- a/tests/c_static_library/src/interface.h
+++ b/tests/static_library_c/src/interface.h
diff --git a/tests/c_static_library/src/test.c b/tests/static_library_c/src/test.c
index 9505a2f75..9505a2f75 100755
--- a/tests/c_static_library/src/test.c
+++ b/tests/static_library_c/src/test.c
diff --git a/tests/c_static_library/xmake.lua b/tests/static_library_c/xmake.lua
index 72fd8c4a0..72fd8c4a0 100755
--- a/tests/c_static_library/xmake.lua
+++ b/tests/static_library_c/xmake.lua
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
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-17 22:45:31 +0000