Fix definition of 'unit_select' in batch files

martinmoene · Jun 3, 2024 · 006a729 · 006a729
1 parent 643873e
commit 006a729
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/test/t.bat b/test/t.bat
@@ -16,9 +16,9 @@ echo VC%version%: %args%
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD
+set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_DEFAULT
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_NONSTD
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_STD
 
 set unit_config=
 

diff --git a/test/tc-cl.bat b/test/tc-cl.bat
@@ -14,8 +14,8 @@ if NOT "%1" == "" set std=%1 & shift
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=%unit%_%UCAP%_NONSTD
-::set unit_select=%unit%_CONFIG_SELECT_%UCAP%_NONSTD
+set unit_select=nsel_%UCAP%_NONSTD
+::set unit_select=nsel_%UCAP%_STD
 if NOT "%1" == "" set unit_select=%1 & shift
 
 set args=%1 %2 %3 %4 %5 %6 %7 %8 %9
@@ -29,7 +29,7 @@ set unit_config=^
     -Dlest_FEATURE_AUTO_REGISTER=1 ^
     -D%unit%_%UCAP%_HEADER=\"nonstd/%unit%.hpp\" ^
     -D%unit%_TEST_NODISCARD=0 ^
-    -D%unit%_CONFIG_SELECT_%UCAP%=%unit_select%
+    -Dnsel_CONFIG_SELECT_%UCAP%=%unit_select%
 
 rem -flto / -fwhole-program
 set  optflags=-O2

diff --git a/test/tc-noexcept.bat b/test/tc-noexcept.bat
@@ -18,9 +18,9 @@ echo %clang% %version%: %std%
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD
+set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_DEFAULT
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_NONSTD
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_STD
 
 set unit_config=
 

diff --git a/test/tc.bat b/test/tc.bat
@@ -18,9 +18,9 @@ echo %clang% %version%: %std%
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD
+set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_DEFAULT
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_NONSTD
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_STD
 
 set unit_config=
 

diff --git a/test/tg-noexcept.bat b/test/tg-noexcept.bat
@@ -19,9 +19,9 @@ echo %gpp% %version%: %std% %args%
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD
+set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_DEFAULT
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_NONSTD
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_STD
 
 set unit_config=-Dnsel_CONFIG_NO_EXCEPTIONS=1
 

diff --git a/test/tg.bat b/test/tg.bat
@@ -19,9 +19,9 @@ echo %gpp% %version%: %std% %args%
 set UCAP=%unit%
 call :toupper UCAP
 
-set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD
-::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD
+set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_DEFAULT
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_NONSTD
+::set unit_select=-Dnsel_CONFIG_SELECT_%UCAP%=nsel_%UCAP%_STD
 
 set unit_config=