From 48d1a2bd4d8e3cc2407cc7b696810a0f4910814a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 20 Nov 2018 15:38:30 +0300 Subject: Add support for configuration classes in buildtab --- tests/buildtab/testscript | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'tests/buildtab/testscript') diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript index 6adc4bc..511d284 100644 --- a/tests/buildtab/testscript +++ b/tests/buildtab/testscript @@ -10,19 +10,31 @@ : all-fileds-combinations : $* <>EOF - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 - 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-32 i686-microsoft-win32-msvc14.0 default + windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: " EOF : empty-lines : $* <>EOO - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 + windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default # abc EOI - windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 + windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default EOO + + : single-class + : + $* <>EOF + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default + EOF + + : multiple-classes + : + $* <>EOF + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 "all default" + EOF } : parse-errors @@ -52,22 +64,30 @@ cin:1:34: error: missing cpu EOE + : invalid-class + : + $* <>EOE == 1 + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 a=b + EOI + cin:1:64: error: class name 'a=b' contains '=' + EOE + : invalid-var : { : unquoted : $* <>EOE == 1 - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 config.cc.coptions="/Z7 + windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default config.cc.coptions="/Z7 EOI - cin:1:87: error: unterminated quoted string + cin:1:95: error: unterminated quoted string EOE } : dup-config-name : $* <'cin:2:17: error: duplicate configuration name' == 1 - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 - windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 + 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 EOI } -- cgit v1.1