The "quilt init" subcommand is a debian-specific addition to quilt, it only allows earlier creation of quilt series metadata, which is automatically done at first subcommand anyways...
Based on comment from Catalin Marinas on the ML: https://mail.gna.org/public/stgit-users/2015-04/msg00015.html Signed-off-by: Vincent Legoll <[email protected]> --- t/t4200-import-s.sh | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/t/t4200-import-s.sh b/t/t4200-import-s.sh index 3d668f3..7fae040 100755 --- a/t/t4200-import-s.sh +++ b/t/t4200-import-s.sh @@ -32,11 +32,6 @@ cleanup_test () { rm -r patches .pc } -before_test () { - # Initialize patch stacking tool - quilt init -} - after_test () { # Revert to master status : undedit files quilt pop -a @@ -150,8 +145,7 @@ prepare_test_env test_expect_success \ 'Import a quilt series with an empty patch' \ - 'before_test && - test_import_quilt_series_empty && + 'test_import_quilt_series_empty && after_test && check_test && cleanup_test @@ -159,8 +153,7 @@ test_expect_success \ test_expect_success \ 'Import a quilt series with indented comments' \ - 'before_test && - test_import_quilt_series_comment_whitespace && + 'test_import_quilt_series_comment_whitespace && after_test && check_test && cleanup_test @@ -168,8 +161,7 @@ test_expect_success \ test_expect_success \ 'Import a quilt series with patches for toplevel files' \ - 'before_test && - test_import_quilt_series_toplevel && + 'test_import_quilt_series_toplevel && after_test && check_test && cleanup_test @@ -177,8 +169,7 @@ test_expect_success \ test_expect_success \ 'Import a quilt series with patches for subdirectories files' \ - 'before_test && - test_import_quilt_series_subdir && + 'test_import_quilt_series_subdir && after_test && check_test && cleanup_test @@ -187,8 +178,7 @@ test_expect_success \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-p" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_unexpected '' && + 'test_import_quilt_series_should_fail_p_something_unexpected '' && after_test && sed -e "s/^\(.*\)$/\1 -p/g" patches/series > series_messed && mv series_messed patches/series && @@ -199,8 +189,7 @@ test_expect_code \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-p1" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_ok 1 && + 'test_import_quilt_series_should_fail_p_something_ok 1 && after_test && sed -e "s/^\(.*\)$/\1 -p1/g" patches/series > series_messed && mv series_messed patches/series && @@ -211,8 +200,7 @@ test_expect_code \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-pab" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_ok ab && + 'test_import_quilt_series_should_fail_p_something_ok ab && after_test && sed -e "s/^\(.*\)$/\1 -pab/g" patches/series > series_messed && mv series_messed patches/series && @@ -223,8 +211,7 @@ test_expect_code \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-p000" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_unexpected 000 && + 'test_import_quilt_series_should_fail_p_something_unexpected 000 && after_test && sed -e "s/^\(.*\)$/\1 -p000/g" patches/series > series_messed && mv series_messed patches/series && @@ -235,8 +222,7 @@ test_expect_code \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-p42" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_unexpected 42 && + 'test_import_quilt_series_should_fail_p_something_unexpected 42 && after_test && sed -e "s/^\(.*\)$/\1 -p42/g" patches/series > series_messed && mv series_messed patches/series && @@ -247,8 +233,7 @@ test_expect_code \ test_expect_code \ 2 \ 'Import a quilt series with unexpected "-pYo" in series' \ - 'before_test && - test_import_quilt_series_should_fail_p_something_unexpected Yo && + 'test_import_quilt_series_should_fail_p_something_unexpected Yo && after_test && sed -e "s/^\(.*\)$/\1 -pYo/g" patches/series > series_messed && mv series_messed patches/series && -- 2.1.4 _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
