From be7238c1d687aee8c50d87c628197f787e433f08 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 17 Feb 2023 21:07:54 +0300 Subject: Add type and language values to newly created package manifest in bdep-new --- tests/new.testscript | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) (limited to 'tests/new.testscript') diff --git a/tests/new.testscript b/tests/new.testscript index 8b63103..a55ef0b 100644 --- a/tests/new.testscript +++ b/tests/new.testscript @@ -28,11 +28,43 @@ status += -d prj created new executable project prj-foo in $~/prj-foo/ EOE + sed -n -e 's/^(type: .+)$/\1/p' prj-foo/manifest >:''; + sed -n -e 's/^language: (.+)$/\1/p' prj-foo/manifest >'c++'; + $build prj-foo/ $config_cxx 2>>~%EOE% %(c\+\+|ld) .+%{2} EOE } + : exe-lib-prefix + : + { + $* -t exe -l c++ libprj-foo 2>>/"EOE" &libprj-foo/***; + warning: executable name starts with 'lib' + created new executable project libprj-foo in $~/libprj-foo/ + EOE + + sed -n -e 's/^type: (.+)$/\1/p' libprj-foo/manifest >'exe'; + + $build libprj-foo/ $config_cxx 2>>~%EOE% + %(c\+\+|ld) .+%{2} + EOE + } + + : exe-c++-suffix + : + { + $* -t exe -l c++ foo.c++ 2>>/"EOE" &foo.c++/***; + created new executable project foo.c++ in $~/foo.c++/ + EOE + + sed -n -e 's/^(language: .+)$/\1/p' foo.c++/manifest >:''; + + $build foo.c++/ $config_cxx 2>>~%EOE% + %(c\+\+|ld) .+%{2} + EOE + } + : exe-c++-c : { @@ -40,6 +72,11 @@ status += -d prj created new executable project foo in $~/foo/ EOE + sed -n -e 's/^language: (.+)$/\1/p' foo/manifest >>EOO; + c++ + c + EOO + touch foo/foo/bar.h; cat <=foo/foo/bar.c; @@ -59,11 +96,28 @@ status += -d prj created new library project libprj-foo in $~/libprj-foo/ EOE + sed -n -e 's/^(type: .+)$/\1/p' libprj-foo/manifest >:''; + $build libprj-foo/ $config_cxx 2>>~%EOE% %(version|c\+\+|ar|ld) .+%{7} EOE } + : lib-no-lib-prefix + : + { + $* -t lib -l c++ prj-foo 2>>/"EOE" &prj-foo/***; + warning: library name does not start with 'lib' + created new library project prj-foo in $~/prj-foo/ + EOE + + sed -n -e 's/^type: (.+)$/\1/p' prj-foo/manifest >'lib'; + + $build prj-foo/ $config_cxx 2>>~%EOE% + %(version|c\+\+|ar|ld) .+%{7} + EOE + } + : lib-c++-c : { @@ -90,6 +144,16 @@ status += -d prj EOE } + : bare + : + { + $* -t bare prj 2>>/"EOE" &prj/***; + created new bare project prj in $~/prj/ + EOE + + sed -n -e 's/^type: (.+)$/\1/p' prj/manifest >'other' + } + : exe-prefix : { @@ -403,11 +467,27 @@ status += -d prj created new executable project prj-foo in $~/prj-foo/ EOE + sed -n -e 's/^language: (.+)$/\1/p' prj-foo/manifest >'c'; + $build prj-foo/ $config_c 2>>~%EOE% %(c|ld) .+%{2} EOE } + : exe-c-suffix + : + { + $* -t exe -l c foo.c 2>>/"EOE" &foo.c/***; + created new executable project foo.c in $~/foo.c/ + EOE + + sed -n -e 's/^(language: .+)$/\1/p' foo.c/manifest >:''; + + $build foo.c/ $config_c 2>>~%EOE% + %(c|ld) .+%{2} + EOE + } + : exe-c-c++ : { @@ -415,6 +495,11 @@ status += -d prj created new executable project foo in $~/foo/ EOE + sed -n -e 's/^language: (.+)$/\1/p' foo/manifest >>EOO; + c + c++ + EOO + touch foo/foo/bar.hxx; cat <=foo/foo/bar.cxx; -- cgit v1.1