diff options
| -rw-r--r-- | tests/config.test | 5 | ||||
| -rw-r--r-- | tests/init.test | 10 | ||||
| -rw-r--r-- | tests/new.test | 7 |
3 files changed, 6 insertions, 16 deletions
diff --git a/tests/config.test b/tests/config.test index e2948da..5beabcf 100644 --- a/tests/config.test +++ b/tests/config.test @@ -211,7 +211,7 @@ deinit += -d prj { $clone_root_prj; - $* create -- @cfg $cxx 2>>/"EOE"; + $* create -- @cfg $cxx &prj-cfg/*** 2>>/"EOE"; created configuration @cfg $~/prj-cfg/ 1 default,forwarded,auto-synchronized EOE @@ -221,8 +221,7 @@ deinit += -d prj % new prj.+19700101000000% EOE - cp --no-cleanup -r prj-cfg prj-cfg2 &prj-cfg2/***; - rm -r prj-cfg; + mv prj-cfg prj-cfg2; $* move @cfg prj-cfg2 2>>/"EOE"; moved configuration @cfg $~/prj-cfg/ 1 to $~/prj-cfg2/ diff --git a/tests/init.test b/tests/init.test index 14293ba..8915189 100644 --- a/tests/init.test +++ b/tests/init.test @@ -150,14 +150,8 @@ deinit += -d prj # mkdir --no-cleanup prj/prj.pkg; - # @@ Shouldn't we add mv builtin? - # - fs = prj/prj/ prj/build/ prj/buildfile prj/manifest prj/.gitignore; - cp --no-cleanup -p -r $fs prj/prj.pkg/; - rm -r $fs; - - cp --no-cleanup -p -r prj/prj.pkg/ prj/prj; - rm -r prj/prj.pkg/; + mv prj/prj prj/build prj/buildfile prj/manifest prj/.gitignore prj/prj.pkg/; + mv prj/prj.pkg prj/prj; cat <<EOI >=prj/packages.manifest; : 1 diff --git a/tests/new.test b/tests/new.test index ae9be31..b5b3670 100644 --- a/tests/new.test +++ b/tests/new.test @@ -69,20 +69,17 @@ status += -d prj : $* -t empty x 2>'error: invalid project name: length is less than two characters' != 0 - #\ - @@ mv : project-derived : - $* -t empty xx 2>>/"EOE"; + $* -t empty xx &xx/*** 2>>/"EOE"; created new empty project xx in $~/xx/ EOE - mv xx x &x/***; + mv xx x; $* --package pkg -d x 2>>/"EOE" warning: project name 'x' is invalid: length is less than two characters info: leaving the 'project' manifest value empty created new executable package pkg in $~/x/pkg/ EOE - #\ } } |