From c94fb10917c404ecdba53a46dd7d497cdeadbc30 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 16 Mar 2020 10:46:03 -0700 Subject: [PATCH] Remove CI builder customization from TEST The default options are reasonable for all of the CI builders. * TEST_XFSTESTS_SKIP=yes - This is already the default. * TEST_ZTEST_TIMEOUT=3600 - Increased ztest run time only increases code coverage by a small degree. Default 900s runs are sufficient. * Disabling certain tests on 32-bit builders is no longer needed. Reviewed-by: George Melikov Reviewed-by: Ryan Moeller Reviewed-by: Kjeld Schouten Signed-off-by: Brian Behlendorf Closes #10129 --- TEST | 61 ------------------------------------------------------------ 1 file changed, 61 deletions(-) diff --git a/TEST b/TEST index ebe6ef963..376d6eb69 100644 --- a/TEST +++ b/TEST @@ -48,64 +48,3 @@ #TEST_ZFSSTRESS_VDEV="/var/tmp/vdev" #TEST_ZFSSTRESS_DIR="/$TEST_ZFSSTRESS_POOL/$TEST_ZFSSTRESS_FS" #TEST_ZFSSTRESS_OPTIONS="" - -### per-builder customization -# -# BB_NAME=builder-name -# - distribution=Amazon,Debian,Fedora,RHEL,SUSE,Ubuntu -# - version=x.y -# - architecture=x86_64,i686,arm,aarch64 -# - type=build,test -# -case "$BB_NAME" in -Amazon*) - # ZFS enabled xfstests fails to build - TEST_XFSTESTS_SKIP="yes" - ;; -CentOS-7*) - # ZFS enabled xfstests fails to build - TEST_XFSTESTS_SKIP="yes" - ;; -CentOS-6*) - ;; -Debian*) - ;; -Fedora*) - ;; -RHEL*) - ;; -SUSE*) - ;; -Ubuntu-16.04*) - # ZFS enabled xfstests fails to build - TEST_XFSTESTS_SKIP="yes" - ;; -Ubuntu*) - ;; -*) - ;; -esac - -### -# -# Run ztest longer on the "coverage" builders to gain more code coverage -# data out of ztest, libzpool, etc. -# -case "$BB_NAME" in -*coverage*) - TEST_ZTEST_TIMEOUT=3600 - ;; -*) - TEST_ZTEST_TIMEOUT=900 - ;; -esac - -### -# -# Disable the following test suites on 32-bit systems. -# -if [ $(getconf LONG_BIT) = "32" ]; then - TEST_ZTEST_SKIP="yes" - TEST_XFSTESTS_SKIP="yes" - TEST_ZFSSTRESS_SKIP="yes" -fi