From 02c759ee303c740d287054f3042911aac1bf046a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 25 Aug 2022 12:25:16 +0300 Subject: Make configuration name/target unique --- tests/buildtab/testscript | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript index c9b5389..5631527 100644 --- a/tests/buildtab/testscript +++ b/tests/buildtab/testscript @@ -6,11 +6,13 @@ : Roundtrip buildtab. : { - : all-fileds-combinations + : all-fields-combinations : $* <>EOO - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 all - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 all + windows*-vc_14* windows-vc_14-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + + windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 all linux_debian_8*-gcc_4.9 linux_debian_8-gcc_4.9 x86_64-linux-gnu "all default linux gcc gcc-4+:gcc-3+" - - - gcc-5+:gcc-4+ @@ -21,8 +23,9 @@ windows_10*-clang_9.0_msvc_16.3 windows_10-clang_9.0_msvc_16.3_lld x86_64-microsoft-win32-msvc14.2/lld "all default windows clang" EOI - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 all - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 all + windows*-vc_14* windows-vc_14-debug i686-microsoft-win32-msvc14.0 "" config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " + windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 all linux_debian_8*-gcc_4.9 linux_debian_8-gcc_4.9 x86_64-linux-gnu "all default linux gcc gcc-4+:gcc-3+" linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3 x86_64-linux-gnu "all default linux gcc gcc-7+:gcc-6+" linux_debian_9*-gcc_7.3 linux_debian_9-gcc_7.3-O3 x86_64-linux-gnu "all default linux gcc optimized gcc-7+:gcc-6+" config.cc.coptions=-O3 @@ -57,9 +60,10 @@ : dup : - $* <'cin:2:17: error: duplicate configuration name' == 1 - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default + $* <'cin:3:31: error: duplicate configuration name/target' == 1 + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 default + windows*-vc_14* windows-vc_14 x86_64-microsoft-win32-msvc14.0 default + windows*-vc_14* windows-vc_14 i686-microsoft-win32-msvc14.0 default EOI } -- cgit v1.1