Integration tests should take .stfolder into account when comparing dirs

test/common_test.go

@@ -324,7 +324,7 @@ func startWalker(dir string, res chan<- fileInfo, abort <-chan struct{}) {
 		}
 
 		rn, _ := filepath.Rel(dir, path)
-		if rn == "." {
+		if rn == "." || rn == ".stfolder" {
 			return nil
 		}
 

test/test-delupd.sh

@@ -64,7 +64,7 @@ testConvergence() {
 
 	for i in 1 2 3 12-1 12-2 23-2 23-3; do
 		pushd "s$i" >/dev/null
-		../md5r -l | sort | grep -v .stversions > ../md5-$i
+		../md5r -l | sort | grep -v .stversions | grep -v .stfolder > ../md5-$i
 		popd >/dev/null
 	done
 
@@ -126,7 +126,7 @@ alterFiles() {
 		chmod 500 ro-test
 		touch "timechanged-$i"
 
-		../md5r -l | sort | grep -v .stversions > ../md5-$i
+		../md5r -l | sort | grep -v .stversions | grep -v .stfolder > ../md5-$i
 		popd >/dev/null
 	done
 

test/test-merge.sh

@@ -43,9 +43,9 @@ stop() {
 
 clean() {
 	if [[ $(uname -s) == "Linux" ]] ; then
-		grep -v .stversions | grep -v utf8-nfd
+		grep -v .stversions | grep -v .stfolder | grep -v utf8-nfd
 	else
-		grep -v .stversions
+		grep -v .stversions | grep -v .stfolder
 	fi
 }