diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-18 15:33:11 -0200 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-18 15:33:11 -0200 |
commit | 3f67e81a25607371efde249d83f1e9521349bb19 (patch) | |
tree | 608728664130451485629ded982377c58ab37899 /test | |
parent | 138d823b77b9cbc30397d05286723cf499d85157 (diff) | |
download | luarocks-3f67e81a25607371efde249d83f1e9521349bb19.tar.gz luarocks-3f67e81a25607371efde249d83f1e9521349bb19.tar.bz2 luarocks-3f67e81a25607371efde249d83f1e9521349bb19.zip |
Add named trees, as suggested by @Tieske, plus tests.
Diffstat (limited to 'test')
-rwxr-xr-x | test/testing.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testing.sh b/test/testing.sh index 0fa40e53..d3ab3308 100755 --- a/test/testing.sh +++ b/test/testing.sh | |||
@@ -59,7 +59,7 @@ mkdir -p "$testing_cache" | |||
59 | cat <<EOF > $testing_dir/testing_config.lua | 59 | cat <<EOF > $testing_dir/testing_config.lua |
60 | rocks_trees = { | 60 | rocks_trees = { |
61 | "$testing_tree", | 61 | "$testing_tree", |
62 | "$testing_sys_tree", | 62 | { name = "system", root = "$testing_sys_tree" }, |
63 | } | 63 | } |
64 | rocks_servers = { | 64 | rocks_servers = { |
65 | "$testing_server" | 65 | "$testing_server" |
@@ -398,8 +398,8 @@ test_admin_remove() { if [ "$travis" ]; then return; fi; $luarocks_admin --serve | |||
398 | fail_admin_remove_missing() { $luarocks_admin --server=testing remove; } | 398 | fail_admin_remove_missing() { $luarocks_admin --server=testing remove; } |
399 | 399 | ||
400 | fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; } | 400 | fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; } |
401 | test_deps_mode_one() { $luarocks build --tree="$testing_sys_tree" lpeg && $luarocks list && $luarocks build --deps-mode=one --tree="$testing_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 1 ]; } | 401 | test_deps_mode_one() { $luarocks build --tree="system" lpeg && $luarocks list && $luarocks build --deps-mode=one --tree="$testing_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 1 ]; } |
402 | test_deps_mode_order() { $luarocks build --tree="$testing_sys_tree" lpeg && $luarocks build --deps-mode=order --tree="$testing_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 0 ]; } | 402 | test_deps_mode_order() { $luarocks build --tree="system" lpeg && $luarocks build --deps-mode=order --tree="$testing_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 0 ]; } |
403 | test_deps_mode_order_sys() { $luarocks build --tree="$testing_tree" lpeg && $luarocks build --deps-mode=order --tree="$testing_sys_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_sys_tree" --porcelain lpeg | wc -l` = 1 ]; } | 403 | test_deps_mode_order_sys() { $luarocks build --tree="$testing_tree" lpeg && $luarocks build --deps-mode=order --tree="$testing_sys_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_sys_tree" --porcelain lpeg | wc -l` = 1 ]; } |
404 | test_deps_mode_all_sys() { $luarocks build --tree="$testing_tree" lpeg && $luarocks build --deps-mode=all --tree="$testing_sys_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_sys_tree" --porcelain lpeg | wc -l` = 0 ]; } | 404 | test_deps_mode_all_sys() { $luarocks build --tree="$testing_tree" lpeg && $luarocks build --deps-mode=all --tree="$testing_sys_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_sys_tree" --porcelain lpeg | wc -l` = 0 ]; } |
405 | test_deps_mode_none() { $luarocks build --tree="$testing_tree" --deps-mode=none lxsh; [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 0 ]; } | 405 | test_deps_mode_none() { $luarocks build --tree="$testing_tree" --deps-mode=none lxsh; [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 0 ]; } |