On github actions, make build fail if any testcases fails. Mark 2 failing testcases

3 files changed, 15 insertions, 15 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 7bbbef9..70bbd5e 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -143,15 +143,13 @@ jobs:
           }
       - name: Run Tests
         run: |
-          xvfb-run --auto-servernum make test-classic | tee out-classic.txt || {
+          xvfb-run --auto-servernum make test-classic | tee out-classic.txt
+          xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt
+          grep -q "Failed	0" out-classic.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
-          xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-          cat out-classic.txt out-ttk.txt | grep -q "Failed	0" || {
+          grep -q "Failed	0" out-ttk.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 5893fb6..3bfd130 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -60,7 +60,11 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-          cat out-classic.txt out-ttk.txt | grep -q "Failed     [1-9]" && {
+          grep -q "Failed	0" out-classic.txt || {
+            echo "::error::Failure during Test"
+            exit 1
+          }
+          grep -q "Failed	0" out-ttk.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
@@ -142,15 +146,13 @@ jobs:
           }
       - name: Run Tests
         run: |
-          make test-classic | tee out-classic.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-          make test-ttk | tee out-ttk.txt || {
+          make test-classic | tee out-classic.txt
+          make test-ttk | tee out-ttk.txt
+          grep -q "Failed	0" out-classic.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
-          cat out-classic.txt out-ttk.txt | grep -q "Failed     [1-9]" && {
+          grep -q "Failed	0" out-ttk.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
diff --git a/tests/font.test b/tests/font.test
index cef8df2..6995a7b 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -2340,7 +2340,7 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} -body {
 } -result [font actual {times 0} -family]
 
 
-test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntuNoXft -setup {
+test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup {
     set oldscale [tk scaling]
 } -body {
     tk scaling 0.5
@@ -2364,7 +2364,7 @@ test font-45.1 {TkFontGetAliasList: no match} -body {
 test font-45.2 {TkFontGetAliasList: match} -constraints win -body {
     font actual {times 10} -family
 } -result {Times New Roman}
-test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
+test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed failsOnUbuntu} -body {
     if {[font actual {{times new roman} 10} -family] eq "Times New Roman"} {
         # avoid test failure on systems that have a real "times new roman" font
         set res 1