summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/mac-build.yml16
-rw-r--r--.github/workflows/win-build.yml9
-rw-r--r--tests/main.test2
3 files changed, 8 insertions, 19 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index ebd6342..874d529 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -3,7 +3,7 @@ on: [push]
env:
ERROR_ON_FAILURES: 1
jobs:
- with-Xcode:
+ xcode:
runs-on: macos-11.0
defaults:
run:
@@ -37,19 +37,7 @@ jobs:
echo "::error::Failure during Build"
exit 1
}
- - name: Run Tests
- run: |
- make test styles=develop | tee out-tests.txt || {
- echo "::error::Failure during Test"
- exit 1
- }
- cat out-tests.txt | grep -q "Failed[[:space:]][[:space:]]*[1-9]" && {
- echo "::error::Failure during Test"
- exit 1
- }
- env:
- MAC_CI: 1
- Unix-like:
+ clang:
runs-on: macos-11.0
strategy:
matrix:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 87f824f..4784933 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -3,7 +3,7 @@ on: [push]
env:
ERROR_ON_FAILURES: 1
jobs:
- MSVC:
+ msvc:
runs-on: windows-2019
defaults:
run:
@@ -22,9 +22,10 @@ jobs:
ref: core-8-6-branch
path: tcl
- name: Make Install Location
- working-directory: .
- shell: bash
+ working-directory: tcl
run: |
+ echo "TCLDIR=`pwd`" >> $GITHUB_ENV
+ cd ..
mkdir install
cd install
echo "INSTALLDIR=`pwd`" >> $GITHUB_ENV
@@ -78,7 +79,7 @@ jobs:
if ($lastexitcode -ne 0) {
throw "nmake exit code: $lastexitcode"
}
- MSYS-gcc:
+ gcc:
runs-on: windows-2019
defaults:
run:
diff --git a/tests/main.test b/tests/main.test
index deb0783..4a3be63 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -94,7 +94,7 @@ test main-2.3 {Tk_MainEx: -encoding option} -constraints stdio -setup {
test main-3.1 {Tk_ParseArgv: -help option} -constraints unix -body {
# Run only on unix as Win32 pops up native dialog
exec [interpreter] -help
-} -returnCodes error -match glob -result {% application-specific initialization failed: Command-specific options:*}
+} -returnCodes error -match glob -result {*application-specific initialization failed: Command-specific options:*}
test main-3.2 {Tk_ParseArgv: -help option} -setup {
set maininterp [interp create]