diff options
| author | fvogel <fvogelnew1@free.fr> | 2021-05-24 08:18:36 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2021-05-24 08:18:36 (GMT) |
| commit | 0cf1388049103f7de8d66a96f6464506d5207f54 (patch) | |
| tree | c0aaa44d1467f44e910c8ad1571001e07d89077f | |
| parent | 69975072cb8e9bec68d034b4a7a12ad04533724c (diff) | |
| parent | 767b4e9262bdb91b097b971637d3899cf8a23528 (diff) | |
| download | tk-0cf1388049103f7de8d66a96f6464506d5207f54.zip tk-0cf1388049103f7de8d66a96f6464506d5207f54.tar.gz tk-0cf1388049103f7de8d66a96f6464506d5207f54.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | .github/workflows/mac-build.yml | 2 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 62aaed9..0bd8cf6 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -127,7 +127,7 @@ jobs: : do nothing } fi - ( runXvfb :0; make test-classic test-ttk TESTFLAGS="-verbose bepst"; exit $? ) | tee out.txt || { + ( runXvfb :0; make test-classic test-ttk; exit $? ) | tee out.txt || { echo "::error::Failure during Test" exit 1 } diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 7c6177e..c8d842d 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -188,7 +188,7 @@ #ifndef __CYGWIN__ #define TkpPrintWindowId(buf,w) \ - sprintf((buf), "%#08lx", (unsigned long) (w)) + sprintf((buf), "0x%08lx", (unsigned long) (w)) #endif /* |