avfs: Rename tag datarace to avfs_race

psadac · psadac · commit 28a08ef93672 · 2023-05-21T18:54:18.000+02:00
diff --git a/.deepsource.toml b/.deepsource.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,6 +30,7 @@ jobs:
         run: avfs test
 
       - name: Run tests as root
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: avfs testAsRoot
 
       - name: Run tests as root with SetOsType
diff --git a/errors_test.go b/errors_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package avfs_test
 
diff --git a/idm/dummyidm/dummyidm_test.go b/idm/dummyidm/dummyidm_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package dummyidm_test
 
diff --git a/idm/memidm/memidm_test.go b/idm/memidm/memidm_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package memidm_test
 
diff --git a/idm/osidm/osidm_test.go b/idm/osidm/osidm_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package osidm_test
 
diff --git a/mage/magefile.go b/mage/magefile.go
@@ -313,7 +313,7 @@ func Race() error {
 	}
 
 	err := sh.RunV(goCmd, "test", "-v",
-		"-tags=datarace",
+		"-tags=avfs_race",
 		"-run=TestRace",
 		"-race",
 		"-count="+strconv.Itoa(raceCount),
diff --git a/test/test_race.go b/test/test_race.go
@@ -46,7 +46,6 @@ func (ts *Suite) TestRace(t *testing.T) {
 		ts.RaceOpenFileExcl,
 		ts.RaceRemove,
 		ts.RaceRemoveAll,
-
 		ts.RaceMkdirRemoveAll)
 }
 
diff --git a/test/testbuild/testbuild.go b/test/testbuild/testbuild.go
@@ -92,6 +92,7 @@ func main() {
 	info, _ := vfs.Stat(tmpFile)
 	vfs.SetUMask(0)
 	_, _ = vfs.SetUser("")
+	_, _ = vfs.Sub("")
 	_ = vfs.SystemDirs(tmpDir)
 	_ = vfs.TempDir()
 	_ = vfs.ToSlash(tmpDir)
diff --git a/utils_test.go b/utils_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package avfs_test
 
diff --git a/vfs/basepathfs/basepathfs_test.go b/vfs/basepathfs/basepathfs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package basepathfs_test
 
diff --git a/vfs/memfs/memfs_internal_test.go b/vfs/memfs/memfs_internal_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package memfs
 
diff --git a/vfs/memfs/memfs_race_test.go b/vfs/memfs/memfs_race_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build datarace
+//go:build avfs_race
 
 package memfs_test
 
diff --git a/vfs/memfs/memfs_test.go b/vfs/memfs/memfs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package memfs_test
 
diff --git a/vfs/mountfs/mountfs_test.go b/vfs/mountfs/mountfs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package mountfs_test
 
diff --git a/vfs/orefafs/orefafs_race_test.go b/vfs/orefafs/orefafs_race_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build datarace
+//go:build avfs_race
 
 package orefafs_test
 
diff --git a/vfs/orefafs/orefafs_test.go b/vfs/orefafs/orefafs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package orefafs_test
 
diff --git a/vfs/osfs/osfs_race_test.go b/vfs/osfs/osfs_race_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build datarace
+//go:build avfs_race
 
 package osfs_test
 
diff --git a/vfs/osfs/osfs_test.go b/vfs/osfs/osfs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package osfs_test
 
diff --git a/vfs/rofs/rofs_test.go b/vfs/rofs/rofs_test.go
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-//go:build !datarace
+//go:build !avfs_race
 
 package rofs_test
 

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ func Race() error {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`err := sh.RunV(goCmd, "test", "-v",`
`316`		`- "-tags=datarace",`
	`316`	`+ "-tags=avfs_race",`
`317`	`317`	`"-run=TestRace",`
`318`	`318`	`"-race",`
`319`	`319`	`"-count="+strconv.Itoa(raceCount),`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ func (ts Suite) TestRace(t testing.T) {`
`46`	`46`	`ts.RaceOpenFileExcl,`
`47`	`47`	`ts.RaceRemove,`
`48`	`48`	`ts.RaceRemoveAll,`
`49`		`-`
`50`	`49`	`ts.RaceMkdirRemoveAll)`
`51`	`50`	`}`
`52`	`51`