Branch meant for investigation of [6978c01b65]. Ongoing

5 files changed, 4 insertions, 232 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 7ba9e89..0bcb51f 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -9,12 +9,7 @@ jobs:
       matrix:
         cfgopt:
           - ""
-          - "CFLAGS=-DTCL_UTF_MAX=3"
           - "CFLAGS=-DTCL_NO_DEPRECATED=1"
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-          - "--enable-symbols=all"
     defaults:
       run:
         shell: bash
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
deleted file mode 100644
index 1ec784a..0000000
--- a/.github/workflows/mac-build.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: macOS
-on: [push]
-permissions:
-  contents: read
-jobs:
-  xcode:
-    runs-on: macos-11
-    defaults:
-      run:
-        shell: bash
-        working-directory: macosx
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: |
-          touch tclStubInit.c tclOOStubInit.c tclOOScript.h
-        working-directory: generic
-      - name: Build
-        run: make all
-        env:
-          CFLAGS: -arch x86_64 -arch arm64e
-      - name: Run Tests
-        run: make test styles=develop
-        env:
-          ERROR_ON_FAILURES: 1
-          MAC_CI: 1
-  clang:
-    runs-on: macos-11
-    strategy:
-      matrix:
-        cfgopt:
-          - ""
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-          - "--enable-symbols=all"
-    defaults:
-      run:
-        shell: bash
-        working-directory: unix
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: |
-          touch tclStubInit.c tclOOStubInit.c tclOOScript.h
-          mkdir "$HOME/install dir"
-        working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
-        # Note that macOS is always a 64 bit platform
-        run: ./configure --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
-        env:
-          CFLAGS: -arch x86_64 -arch arm64e
-          CFGOPT: ${{ matrix.cfgopt }}
-      - name: Build
-        run: |
-          make all tcltest
-        env:
-          CFLAGS: -arch x86_64 -arch arm64e
-      - name: Run Tests
-        run: |
-          make test
-        env:
-          ERROR_ON_FAILURES: 1
-          MAC_CI: 1
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
deleted file mode 100644
index 45ce720..0000000
--- a/.github/workflows/onefiledist.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-name: Build Binaries
-on: [push]
-permissions:
-  contents: read
-jobs:
-  linux:
-    name: Linux
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: |
-          touch generic/tclStubInit.c generic/tclOOStubInit.c
-          mkdir 1dist
-          echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
-        working-directory: .
-      - name: Configure
-        run: ./configure --disable-symbols --disable-shared --enable-zipfs
-        working-directory: unix
-      - name: Build
-        run: |
-          make tclsh
-          make shell SCRIPT="$VER_PATH $GITHUB_ENV"
-          echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
-        working-directory: unix
-      - name: Package
-        run: |
-          cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_snapshot
-          chmod +x tclsh${TCL_PATCHLEVEL}_snapshot
-          tar -cf tclsh${TCL_PATCHLEVEL}_snapshot.tar tclsh${TCL_PATCHLEVEL}_snapshot
-        working-directory: 1dist
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (snapshot)
-          path: 1dist/*.tar
-  macos:
-    name: macOS
-    runs-on: macos-11
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Checkout create-dmg
-        uses: actions/checkout@v3
-        with:
-          repository: create-dmg/create-dmg
-          ref: v1.0.8
-          path: create-dmg
-      - name: Prepare
-        run: |
-          mkdir 1dist
-          touch generic/tclStubInit.c generic/tclOOStubInit.c || true
-          wget https://github.com/culler/macher/releases/download/v1.3/macher
-          sudo cp macher /usr/local/bin
-          sudo chmod a+x /usr/local/bin/macher
-          echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
-          echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV
-          echo "CFLAGS=-arch x86_64 -arch arm64e" >> $GITHUB_ENV
-      - name: Configure
-        run: ./configure --disable-symbols --disable-shared --enable-zipfs
-        working-directory: unix
-      - name: Build
-        run: |
-          make tclsh
-          make shell SCRIPT="$VER_PATH $GITHUB_ENV"
-          echo "TCL_BIN=`pwd`/tclsh" >> $GITHUB_ENV
-          echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
-        working-directory: unix
-      - name: Package
-        run: |
-          mkdir contents
-          cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_snapshot
-          chmod +x contents/tclsh${TCL_PATCHLEVEL}_snapshot
-          cat > contents/README.txt <<EOF
-          This is a single-file executable developer preview of Tcl $TCL_PATCHLEVEL
-
-          It is not intended as an official release at all, so it is unsigned and unnotarized.
-          Use strictly at your own risk.
-
-          To run it, you need to copy the executable out and run:
-              xattr -d com.apple.quarantine tclsh${TCL_PATCHLEVEL}_snapshot
-          to mark the executable as runnable on your machine.
-          EOF
-          $CREATE_DMG \
-              --volname "Tcl $TCL_PATCHLEVEL (snapshot)" \
-              --window-pos 200 120 \
-              --window-size 800 400 \
-              "Tcl-$TCL_PATCHLEVEL-(snapshot).dmg" \
-              "contents/"
-        working-directory: 1dist
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (snapshot)
-          path: 1dist/*.dmg
-  win:
-    name: Windows
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: msys2 {0}
-    env:
-      CC: gcc
-      CFGOPT: --disable-symbols --disable-shared
-    steps:
-      - name: Install MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          install: git mingw-w64-ucrt-x86_64-toolchain make zip
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: |
-          touch generic/tclStubInit.c generic/tclOOStubInit.c
-          echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
-          mkdir 1dist
-        working-directory: .
-      - name: Configure
-        run: ./configure $CFGOPT
-        working-directory: win
-      - name: Build
-        run: |
-          make binaries libraries
-          echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
-        working-directory: win
-      - name: Get Exact Version
-        run: |
-          ./tclsh*.exe $VER_PATH $GITHUB_ENV
-        working-directory: win
-      - name: Set Executable Name
-        run: |
-          cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_snapshot.exe
-        working-directory: 1dist
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (snapshot)
-          path: '1dist/*_snapshot.exe'
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index ba4e5ba..6fe21d5 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -14,12 +14,7 @@ jobs:
     strategy:
       matrix:
         cfgopt:
-          - ""
-          - "OPTS=utf16"
           - "CHECKS=nodep"
-          - "OPTS=static"
-          - "OPTS=symbols"
-          - "OPTS=symbols STATS=compdbg,memdbg"
     # Using powershell means we need to explicitly stop on failure
     steps:
       - name: Checkout
@@ -53,13 +48,7 @@ jobs:
     strategy:
       matrix:
         cfgopt:
-          - ""
-          - "CFLAGS=-DTCL_UTF_MAX=3"
           - "CFLAGS=-DTCL_NO_DEPRECATED=1"
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-          - "--enable-symbols=all"
     # Using powershell means we need to explicitly stop on failure
     steps:
       - name: Install MSYS2
diff --git a/tests/io.test b/tests/io.test
index 5c45918..49cec51 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8954,7 +8954,7 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
 
 # Note: the following tests 75.1 to 75.3 are in preparation for TCL 9.0, where
 # those should result in an error result
-test io-75.1 {multibyte encoding error read results in raw bytes} -constraints deprecated -setup {
+test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
 	set fn [makeFile {} io-75.1]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -8969,10 +8969,10 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -constraints d
 } -cleanup {
 	close $f
 	removeFile io-75.1
-} -returnCodes ok -result "A\xC0\x40"
+} -returnCodes ok -result "A"
 # for TCL 9.0, the result is error
 
-test io-75.2 {unrepresentable character write passes and is replaced by ?} -constraints deprecated -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ?} -setup {
 	set fn [makeFile {} io-75.2]
     set f [open $fn w+]
     fconfigure $f -encoding iso8859-1
@@ -8985,7 +8985,7 @@ test io-75.2 {unrepresentable character write passes and is replaced by ?} -cons
 } -cleanup {
 	close $f
 	removeFile io-75.2
-} -returnCodes ok -result "A?"
+} -returnCodes ok -result "A"
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.