From 10f9391a22493cbad2913e164b5aac24f7fc75aa Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 4 Apr 2017 16:20:16 -0700 Subject: [PATCH] test: Shorten some relative paths using readlink Core dumps stop working if the path is longer than 64 bytes. Use readlink to shorten some of the very long relative paths. Change-Id: I5e7eb6580ca581c5ac3a71afb7b62953836e2660 Signed-off-by: Ben Walker --- test/blobfs/rocksdb/rocksdb.sh | 2 +- test/iscsi_tgt/calsoft/calsoft.sh | 2 +- test/iscsi_tgt/ext4test/ext4test.sh | 2 +- test/iscsi_tgt/filesystem/filesystem.sh | 2 +- test/iscsi_tgt/fio/fio.sh | 2 +- test/iscsi_tgt/idle_migration/idle_migration.sh | 2 +- test/iscsi_tgt/ip_migration/ip_migration.sh | 2 +- test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh | 2 +- test/iscsi_tgt/rbd/rbd.sh | 2 +- test/iscsi_tgt/reset/reset.sh | 2 +- test/iscsi_tgt/rpc_config/rpc_config.sh | 2 +- test/lib/bdev/blockdev.sh | 2 +- test/lib/env/env.sh | 2 +- test/lib/event/event.sh | 2 +- test/lib/ioat/ioat.sh | 2 +- test/lib/nvme/hotplug.sh | 2 +- test/lib/nvme/nvme.sh | 2 +- test/lib/nvme/nvmemp.sh | 2 +- test/vhost/integrity/integrity_start.sh | 4 ++-- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index d5b08ece3..d8d92b5dc 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh DB_BENCH_DIR=/usr/src/rocksdb diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index d43fcb523..9a890b2a7 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ ! -d /usr/local/calsoft ]; then diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index 020cc5788..34ad77847 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ ! -z $1 ]; then diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh index df4baa030..99ef7d464 100755 --- a/test/iscsi_tgt/filesystem/filesystem.sh +++ b/test/iscsi_tgt/filesystem/filesystem.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ -z "$TARGET_IP" ]; then diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 4a051c475..57b74599a 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh function running_config() { diff --git a/test/iscsi_tgt/idle_migration/idle_migration.sh b/test/iscsi_tgt/idle_migration/idle_migration.sh index e6d7fe0f1..0f508cb70 100755 --- a/test/iscsi_tgt/idle_migration/idle_migration.sh +++ b/test/iscsi_tgt/idle_migration/idle_migration.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ -z "$TARGET_IP" ]; then diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index 28c266c27..ccd48cf8e 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ -z "$TARGET_IP" ]; then diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 62d99ab38..58dd92331 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh source $rootdir/test/nvmf/common.sh diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh index 4cb4f3d27..460900ed0 100755 --- a/test/iscsi_tgt/rbd/rbd.sh +++ b/test/iscsi_tgt/rbd/rbd.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ ! -d $CEPH_DIR ]; then diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh index 4b08c1dae..2e6701725 100755 --- a/test/iscsi_tgt/reset/reset.sh +++ b/test/iscsi_tgt/reset/reset.sh @@ -3,7 +3,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ -z "$TARGET_IP" ]; then diff --git a/test/iscsi_tgt/rpc_config/rpc_config.sh b/test/iscsi_tgt/rpc_config/rpc_config.sh index f06f10c60..5422c8d16 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.sh +++ b/test/iscsi_tgt/rpc_config/rpc_config.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ -z "$TARGET_IP" ]; then diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh index dd4e5b593..9b27f8611 100755 --- a/test/lib/bdev/blockdev.sh +++ b/test/lib/bdev/blockdev.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh testdir=$(readlink -f $(dirname $0)) diff --git a/test/lib/env/env.sh b/test/lib/env/env.sh index 11d7c51cf..0907c020a 100755 --- a/test/lib/env/env.sh +++ b/test/lib/env/env.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh timing_enter env diff --git a/test/lib/event/event.sh b/test/lib/event/event.sh index f9f635e1e..e829629cf 100755 --- a/test/lib/event/event.sh +++ b/test/lib/event/event.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$testdir/../../.. +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh timing_enter event diff --git a/test/lib/ioat/ioat.sh b/test/lib/ioat/ioat.sh index 1fad2d34b..5015b39ae 100755 --- a/test/lib/ioat/ioat.sh +++ b/test/lib/ioat/ioat.sh @@ -3,7 +3,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) -rootdir="$testdir/../../.." +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh timing_enter ioat diff --git a/test/lib/nvme/hotplug.sh b/test/lib/nvme/hotplug.sh index 5fa0f6a86..1d03f5f97 100755 --- a/test/lib/nvme/hotplug.sh +++ b/test/lib/nvme/hotplug.sh @@ -3,7 +3,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) -rootdir="$testdir/../../.." +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh function ssh_vm() { diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh index 71e37b007..419b5a8d0 100755 --- a/test/lib/nvme/nvme.sh +++ b/test/lib/nvme/nvme.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir="$testdir/../../.." +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh function linux_iter_pci { diff --git a/test/lib/nvme/nvmemp.sh b/test/lib/nvme/nvmemp.sh index 153a2d3d2..49f102b73 100755 --- a/test/lib/nvme/nvmemp.sh +++ b/test/lib/nvme/nvmemp.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir="$testdir/../../.." +rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh if [ $(uname -s) = Linux ]; then diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 0bcde0909..5763914df 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash basedir=$(readlink -f $(dirname $0)) -rootdir=$basedir/../../.. -testdir=$rootdir/.. +rootdir=$(readlink -f $basedir/../../..) +testdir=$(readlink -f $rootdir/..) qemu_src_dir="$testdir/qemu" qemu_build_dir="$testdir/qemu/build" qemu_install_dir="$testdir/root"