generic/260: fix unary operator error when run tests

EXCLUDE

@@ -0,0 +1,21 @@
+btrfs/125
+btrfs/282
+btrfs/287
+btrfs/290
+btrfs/291
+generic/251
+generic/260
+# Sometimes the fragment count is too high? Usually with compression
+generic/301
+generic/302
+shared/298
+# Temporary for CI
+# normal, block_group_tree, for-next, EUCLEAN
+##check if still needed
+##btrfs/330
+# test-zoned, for-next, something found in dmesg
+generic/476
+# test-zoned, for-next, mount: /mnt/scratch: can't read superblock on /dev/mapper/flakey-test
+# mtime not preserved, expected: 1705082371 got: 1704844056
+# ctime not preserved, expected: 1705082371 got: 1704844056
+btrfs/236

EXCLUDE.arm

@@ -0,0 +1,8 @@
+# Sometimes qgroups fail with wrong accounting during check
+btrfs/028
+# Inconsistent timing
+btrfs/049
+# Numbers don't match up
+generic/563
+# Takes too long
+generic/619

EXCLUDE.zoned

@@ -0,0 +1,14 @@
+# This fails because of discard=async, test needs to be updated
+btrfs/220
+# This seems like a real failure, needs to be looked into
+btrfs/237
+# This also seems like a real failure, needs to be looked into
+btrfs/239
+# This appears to be flakey
+btrfs/273
+# IDK, seems like erorr stuff doesn't work right with zoned?
+btrfs/295
+# Short reads?  Seems like a real failure
+generic/551
+# Another one in the same vein
+generic/574

Makefile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 # Copyright (C) 2000-2008, 2011 SGI  All Rights Reserved.
-#
+##
 ifeq ("$(origin V)", "command line")
   BUILD_VERBOSE = $(V)
 endif

btrfs-ci.config

@@ -0,0 +1,82 @@
+[btrfs_normal]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K"
+
+[btrfs_compress]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K"
+MOUNT_OPTIONS="-o compress"
+RECREATE_TEST_DEV=true
+
+[btrfs_holes_spacecache]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -O ^no-holes,^free-space-tree"
+RECREATE_TEST_DEV=true
+
+[btrfs_holes_spacecache_compress]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -O ^no-holes,^free-space-tree"
+MOUNT_OPTIONS="-o compress"
+RECREATE_TEST_DEV=true
+
+[btrfs_block_group_tree]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -O block-group-tree"
+RECREATE_TEST_DEV=true
+
+[btrfs_raid_stripe_tree]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -O raid-stripe-tree"
+RECREATE_TEST_DEV=true
+
+[btrfs_squota]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -O squota"
+RECREATE_TEST_DEV=true
+
+[btrfs_subpage_normal]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -n 4k -s 4k"
+RECREATE_TEST_DEV=true
+
+[btrfs_subpage_compress]
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/vdb
+SCRATCH_DEV_POOL="/dev/vdc /dev/vdd /dev/vde /dev/vdg /dev/vdh /dev/vdi /dev/vdj /dev/vdk"
+SCRATCH_MNT=/mnt/scratch
+LOGWRITES_DEV=/dev/vdl
+MKFS_OPTIONS="-K -n 4k -s 4k"
+MOUNT_OPTIONS="-o compress"
+RECREATE_TEST_DEV=true

check

@@ -28,6 +28,7 @@ iterations=1
 istop=false
 loop_on_fail=0
 exclude_tests=()
+EXTERNAL_SCRIPTS=()
 
 # This is a global variable used to pass test failure text to reporting gunk
 _err_msg=""
@@ -83,6 +84,7 @@ check options
     -s section		run only specified section from config file
     -S section		exclude the specified section from the config file
     -L <n>		loop tests <n> times following a failure, measuring aggregate pass/fail metrics
+    --external FILE     use external testscript FILE, can be specified multiple times
 
 testlist options
     -g group[,group...]	include tests from these groups
@@ -342,6 +344,16 @@ while [ $# -gt 0 ]; do
 		loop_on_fail=$2; shift
 		;;
 
+	--external)
+		xfile="$2"; shift;
+		if ! [ -f "$xfile" ]; then
+			echo "External script $xfile is not a file"
+			exit 1
+		fi
+		echo "Adding external script $xfile"
+		EXTERNAL_SCRIPTS+=("$xfile")
+		;;
+
 	-*)	usage ;;
 	*)	# not an argument, we've got tests now.
 		have_test_arg=true ;;
@@ -385,6 +397,10 @@ if [ -n "$subdir_xfile" ]; then
 	done
 fi
 
+for ext in ${EXTERNAL_SCRIPTS[*]}; do
+	echo "$ext" >> $tmp.list
+done
+
 # Process tests from command line now.
 if $have_test_arg; then
 	while [ $# -gt 0 ]; do
@@ -1055,7 +1071,7 @@ function run_section()
 			fi
 			echo ""
 		else
-			_dump_err "- output mismatch (see $seqres.out.bad)"
+			_dump_err "`expr $stop - $start`s - output mismatch (see $seqres.out.bad)"
 			mv $tmp.out $seqres.out.bad
 			$diff $seq.out $seqres.out.bad | {
 			if test "$DIFF_LENGTH" -le 0; then

collect-notrun-to-summary.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+	echo "ERROR: $0 path-to-fstests [config_name]"
+	exit 1
+fi
+
+here="$1"
+tdir="$here/tests"
+rdir="$here/results"
+config=
+
+if [ -n "$2" ]; then
+	config="$2"
+fi
+
+cdir="$rdir/$config"
+
+if ! [ -d "$cdir" ]; then
+	echo "ERROR: config dir $cdir doe not exist"
+	exit 1
+fi
+
+echo "<details><summary>Tests not run</summary>"
+echo
+echo '```'
+
+find "$cdir" -type f -name '*.notrun' -exec cat '{}' \; |
+        sort |
+        uniq -c |
+        sort -rn
+
+echo '```'
+echo
+echo "</details>"

collect-results-to-summary.sh

@@ -0,0 +1,66 @@
+#!/bin/sh -x
+
+if [ -z "$1" ]; then
+	echo "ERROR: $0 path-to-fstests [config_name]"
+	exit 1
+fi
+
+here="$1"
+tdir="$here/tests"
+rdir="$here/results"
+
+config=
+
+if [ -n "$2" ]; then
+	config="$2"
+fi
+
+cdir="$rdir/$config"
+
+if ! [ -d "$cdir" ]; then
+	echo "ERROR: config dir $cdir doe not exist"
+	exit 1
+fi
+
+for bad in $(find "results/$config" -type f -name '*.bad'); do
+	echo "::notice::$bad"
+        pbad=${bad#results/$config/}
+        pbase=${pbad%.bad}
+        pname=${pbase%.out}
+        echo "<details><summary>Test: $pname DIFF</summary>"
+        echo
+
+        dmesg="$cdir/${pname}.dmesg"
+        if [ -f "$dmesg" ]; then
+                echo "<details><summary>Test: $pname DMESG</summary>"
+                echo
+                echo '```'
+                cat "$dmesg"
+                echo '```'
+                echo
+                echo "</details>"
+                echo
+        fi
+
+        full="$cdir/${pname}.full"
+        if [ -f "$full" ]; then
+                echo "<details><summary>Test: $pname FULL</summary>"
+                echo
+                echo '```'
+                cat "$full"
+                echo '```'
+                echo
+                echo "</details>"
+                echo
+        fi
+
+        # Diff
+        echo '```'
+        tst="$tdir/$pbase"
+        diff -u "$tst" "$bad"
+        echo '```'
+        echo
+
+        echo "</details>"
+        exit
+done

common/btrfs

@@ -148,6 +148,16 @@ _require_btrfs_free_space_tree()
 	fi
 }
 
+_require_btrfs_no_block_group_tree()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	if $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | \
+		grep -q "BLOCK_GROUP_TREE"
+	then
+		_notrun "This test requires no block-group-tree"
+	fi
+}
+
 _check_btrfs_filesystem()
 {
 	device=$1
@@ -168,6 +178,11 @@ _check_btrfs_filesystem()
 			echo "*** qgroup_report.$FSTYP output ***"	>>$seqres.full
 			cat $tmp.qgroup_report				>>$seqres.full
 			echo "*** qgroup_report.$FSTYP output ***"	>>$seqres.full
+
+			_ci_warning "filesystem on $device has wrong qgroup numbers"
+			_ci_group "qgroup report"
+			_in_ci && cat $tmp.qgroup_report
+			_ci_group
 		fi
 		rm -f $tmp.qgroup_report
 	fi
@@ -179,6 +194,11 @@ _check_btrfs_filesystem()
 		cat $tmp.fsck				>>$seqres.full
 		echo "*** end fsck.$FSTYP output"	>>$seqres.full
 
+		_ci_warning "filesystem on $device is inconsistent"
+		_ci_group "fsck output"
+		_in_ci && cat $tmp.fsck
+		_ci_group
+
 		ok=0
 	fi
 	rm -f $tmp.fsck
@@ -248,6 +268,14 @@ _btrfs_get_profile_configs()
 		)
 	fi
 
+	if _normalize_mount_options "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption"; then
+		# Encryption and RAID56 is unsupported currently
+		unsupported+=(
+			"raid5"
+			"raid6"
+		)
+	fi
+
 	if _scratch_btrfs_is_zoned; then
 		# Zoned btrfs only supports SINGLE profile
 		unsupported+=(

common/config

@@ -69,6 +69,9 @@ export LOAD_FACTOR=${LOAD_FACTOR:=1}
 export SOAK_DURATION=${SOAK_DURATION:=}
 export DEBUGFS_MNT=${DEBUGFS_MNT:="/sys/kernel/debug"}
 
+# We want to keep all messages
+export KEEP_DMESG=${KEEP_DMESG:-yes}
+
 # some constants for overlayfs setup
 export OVL_UPPER="ovl-upper"
 export OVL_LOWER="ovl-lower"