summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTitanSnow <[email protected]>2017-05-24 06:59:13 +0800
committerTitanSnow <[email protected]>2017-05-24 06:59:13 +0800
commit7e750ae50b5693d39f9118b7a0490c80185deba2 (patch)
tree585a4cdd0735b08e35cb0e62f7e4bfddb52f8307
parent3ddda439ed32acac8dc4028036c4bd81b4a6af89 (diff)
Revert "use $(xmake) instead of xmake to fix cnf"
This reverts commit f2e0d829b43011cce87568118a5b8b0b469ade1e.
-rw-r--r--tests/build.lua50
1 files changed, 25 insertions, 25 deletions
diff --git a/tests/build.lua b/tests/build.lua
index 12c23b7c5..6a2ccb339 100644
--- a/tests/build.lua
+++ b/tests/build.lua
@@ -2,41 +2,41 @@
function main(argv)
-- generic?
- os.exec("$(xmake) m -b")
- os.exec("$(xmake) f -c")
- os.exec("$(xmake)")
+ os.exec("xmake m -b")
+ os.exec("xmake f -c")
+ os.exec("xmake")
if os.host() ~= "windows" then
- os.exec("$(xmake) install -o /tmp -a --verbose --backtrace")
- os.exec("$(xmake) uninstall --installdir=/tmp --verbose --backtrace")
+ os.exec("xmake install -o /tmp -a --verbose --backtrace")
+ os.exec("xmake uninstall --installdir=/tmp --verbose --backtrace")
end
- os.exec("$(xmake) p")
- os.exec("$(xmake) c")
- os.exec("$(xmake) f -m release")
- os.exec("$(xmake) -r -a -v --backtrace")
- os.exec("$(xmake) f --mode=debug --verbose --backtrace")
- os.exec("$(xmake) --rebuild --all --verbose --backtrace")
- os.exec("$(xmake) p --verbose --backtrace")
- os.exec("$(xmake) c --verbose --backtrace")
- os.exec("$(xmake) m -e buildtest")
- os.exec("$(xmake) m -l")
- os.exec("$(xmake) f --cc=gcc --cxx=g++")
- os.exec("$(xmake) m buildtest")
+ os.exec("xmake p")
+ os.exec("xmake c")
+ os.exec("xmake f -m release")
+ os.exec("xmake -r -a -v --backtrace")
+ os.exec("xmake f --mode=debug --verbose --backtrace")
+ os.exec("xmake --rebuild --all --verbose --backtrace")
+ os.exec("xmake p --verbose --backtrace")
+ os.exec("xmake c --verbose --backtrace")
+ os.exec("xmake m -e buildtest")
+ os.exec("xmake m -l")
+ os.exec("xmake f --cc=gcc --cxx=g++")
+ os.exec("xmake m buildtest")
if os.host() ~= "windows" then
- os.exec("sudo $(xmake) install")
- os.exec("sudo $(xmake) uninstall")
+ os.exec("sudo xmake install")
+ os.exec("sudo xmake uninstall")
end
- os.exec("$(xmake) f --cc=clang --cxx=clang++ --ld=clang++ --verbose --backtrace")
- os.exec("$(xmake) m buildtest")
+ os.exec("xmake f --cc=clang --cxx=clang++ --ld=clang++ --verbose --backtrace")
+ os.exec("xmake m buildtest")
if os.host() ~= "windows" then
- os.exec("sudo $(xmake) install --all -v --backtrace")
- os.exec("sudo $(xmake) uninstall -v --backtrace")
+ os.exec("sudo xmake install --all -v --backtrace")
+ os.exec("sudo xmake uninstall -v --backtrace")
end
- os.exec("$(xmake) m -d buildtest")
+ os.exec("xmake m -d buildtest")
-- test iphoneos?
if argv and argv.iphoneos then
if os.host() == "macosx" then
- os.exec("$(xmake) m package -p iphoneos")
+ os.exec("xmake m package -p iphoneos")
end
end
end