From 20e0998a323f571ddb5f5aaf9789dcc8fa6b06b7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Dec 2020 09:38:24 +0000
Subject: Use more 0o??? syntax for octal. Clean up build *.yml files

---
 .github/workflows/linux-build.yml | 3 ++-
 .github/workflows/mac-build.yml   | 3 ++-
 .travis.yml                       | 3 ---
 tests/chanio.test                 | 2 +-
 tests/unixFCmd.test               | 4 ++--
 tests/unixFile.test               | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index bf0a4cb..3d56638 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -20,7 +20,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Prepare
-        run: touch tclStubInit.c tclOOStubInit.c
+        run: |
+          touch tclStubInit.c tclOOStubInit.c
         working-directory: generic
       - name: Configure ${{ matrix.cfgopt }}
         run: |
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 3302265..c1144ab 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -11,7 +11,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Prepare
-        run: touch tclStubInit.c tclOOStubInit.c
+        run: |
+          touch tclStubInit.c tclOOStubInit.c
         working-directory: generic
       - name: Build
         run: make all
diff --git a/.travis.yml b/.travis.yml
index d2e3ca9..eb1ec0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,7 +190,6 @@ jobs:
         - BUILD_DIR=win
         - VCDIR="/C/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"
       before_install: &vcpreinst
-        - rm -rf tests/safe-stock8*.test
         - touch generic/tclStubInit.c generic/tclOOStubInit.c
         - PATH="$PATH:$VCDIR"
         - cd ${BUILD_DIR}
@@ -297,7 +296,6 @@ jobs:
         - BUILD_DIR=win
         - CFGOPT="--enable-64bit"
       before_install: &makepreinst
-        - rm -rf tests/safe-stock8*.test
         - touch generic/tclStubInit.c generic/tclOOStubInit.c
         - choco install -y make
         - cd ${BUILD_DIR}
@@ -374,7 +372,6 @@ jobs:
       script:
         - make dist
 before_install:
-  - rm -rf tests/safe-stock8*.test
   - touch generic/tclStubInit.c generic/tclOOStubInit.c
   - cd ${BUILD_DIR}
 install:
diff --git a/tests/chanio.test b/tests/chanio.test
index 5586015..28da530 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -5334,7 +5334,7 @@ test chan-io-40.1 {POSIX open access modes: RDWR} -setup {
 test chan-io-40.2 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
 } -constraints {unix} -body {
-    set f [open $path(test3) {WRONLY CREAT} 0600]
+    set f [open $path(test3) {WRONLY CREAT} 0o600]
     file stat $path(test3) stats
     set x [format 0o%03o [expr {$stats(mode) & 0o777}]]
     chan puts $f "line 1"
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 991e489..4b1687f 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -137,11 +137,11 @@ test unixFCmd-1.7 {TclpRenameFile: EXDEV} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
     file mkdir foo/bar
-    file attr foo -perm 040555
+    file attr foo -perm 0o40555
     file rename foo/bar /tmp
 } -returnCodes error -cleanup {
     catch {file delete /tmp/bar}
-    catch {file attr foo -perm 040777}
+    catch {file attr foo -perm 0o40777}
     catch {file delete -force foo}
 } -match glob -result {*: permission denied}
 test unixFCmd-1.8 {Checking EINTR Bug} {unix notRoot nonPortable} {
diff --git a/tests/unixFile.test b/tests/unixFile.test
index 492e5d0..3669cce 100644
--- a/tests/unixFile.test
+++ b/tests/unixFile.test
@@ -24,7 +24,7 @@ cd [temporaryDirectory]
 
 catch {
     set oldPath $env(PATH)
-    file attributes [makeFile "" junk] -perm 0777
+    file attributes [makeFile "" junk] -perm 0o777
 }
 set absPath [file join [temporaryDirectory] junk]
 
-- 
cgit v0.12