[lmi-commits] [lmi] master a9bed382 08/13: Reduce redundancy

[Greg Chicares]

branch: master
commit a9bed382f62dc31f06ac47eb3e7fd900d3ecae26
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Reduce redundancy
    
    "build_type=so_test" now implies "USE_SO_ATTRIBUTES=1".
---
 .github/workflows/ci.yml | 2 +-
 GNUmakefile              | 2 +-
 gwc/develop1.txt         | 2 +-
 nychthemeral_test.sh     | 4 ++--
 tabs/3/startup_script    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73e01b01..a61e564e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -288,7 +288,7 @@ jobs:
 
       - name: Build lmi with SO attributes
         if: matrix.autotools != true
-        run: make $coefficiency --output-sync=recurse build_type=so_test 
USE_SO_ATTRIBUTES=1 all
+        run: make $coefficiency --output-sync=recurse build_type=so_test all
 
       - name: Setup lmi for tests
         run: |
diff --git a/GNUmakefile b/GNUmakefile
index d664e920..e0eae748 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -628,7 +628,7 @@ checkout:
 .PHONY: test_various_build_types
 test_various_build_types: source_clean
        -$(MAKE) test build_type=safestdlib
-       -$(MAKE) all cgi_tests cli_tests build_type=so_test USE_SO_ATTRIBUTES=1
+       -$(MAKE) all cgi_tests cli_tests build_type=so_test
        -$(MAKE) check_concinnity
        -$(MAKE) check_physical_closure
        -$(MAKE) all test
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index ef12aca1..18d8b1ac 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -254,7 +254,7 @@ make $coefficiency unit_tests 2>&1 | tee >(grep '\*\*\*') 
>(grep '????') >(grep
 
   # other build types
 
-make $coefficiency all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 |less -S
+make $coefficiency all build_type=so_test 2>&1 |less -S
 make $coefficiency cgi_tests cli_tests build_type=safestdlib  2>&1 |less -S
 make $coefficiency unit_tests build_type=safestdlib 2>&1 | tee >(grep 
'\*\*\*') >(grep '????') >(grep '!!!!' --count | xargs printf '%d tests 
succeeded\n') >../log
 
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 9c0e7b78..53da8dca 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -335,11 +335,11 @@ make "$coefficiency" --output-sync=recurse unit_tests 
2>&1 \
   | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit_tests
 
 printf '\n# build with shared-object attributes\n\n'
-make "$coefficiency" all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 \
+make "$coefficiency" all build_type=so_test 2>&1 \
   | tee "$log_dir"/default_targets_so_test | sed -e "$build_clutter"
 
 printf '\n# cgi and cli tests with shared-object attributes\n\n'
-make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 
build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 \
+make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 
build_type=so_test 2>&1 \
   | tee "$log_dir"/cgi_cli_so_test | sed -e "$build_clutter" -e 
"$cli_cgi_clutter"
 
 printf '\n# cgi and cli tests in libstdc++ debug mode\n\n'
diff --git a/tabs/3/startup_script b/tabs/3/startup_script
index 5731ad25..fa9ebdce 100755
--- a/tabs/3/startup_script
+++ b/tabs/3/startup_script
@@ -7,7 +7,7 @@ c='make $coefficiency install check_physical_closure 2>&1 | tee 
../log | sed -f
 d='make $coefficiency cgi_tests cli_tests 2>&1 | less -S'
 e='make $coefficiency system_test 2>&1 | less -S'
 f="make \$coefficiency --output-sync=recurse unit_tests 2>&1 | tee >(grep 
'\*\*\*') >(grep '????') >(grep '!!!!' --count | xargs printf '%d tests 
succeeded\n') >../log"
-g='make $coefficiency all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 | tee 
../log | sed -f diagnostics.sed | less -S'
+g='make $coefficiency all build_type=so_test 2>&1 | tee ../log | sed -f 
diagnostics.sed | less -S'
 h='make $coefficiency cgi_tests cli_tests build_type=safestdlib 2>&1 | tee 
../log | sed -f diagnostics.sed | less -S'
 i="make \$coefficiency --output-sync=recurse unit_tests build_type=safestdlib 
2>&1 | tee >(grep '\*\*\*') >(grep '????') >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >../log"
 j='./nychthemeral_test.sh'