From patchwork Sat Jan 9 00:13:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 59420 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp860871lbb; Fri, 8 Jan 2016 16:16:19 -0800 (PST) X-Received: by 10.28.96.193 with SMTP id u184mr1405015wmb.64.1452298576725; Fri, 08 Jan 2016 16:16:16 -0800 (PST) Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com. [209.132.183.37]) by mx.google.com with ESMTPS id iw7si178406938wjb.105.2016.01.08.16.16.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2016 16:16:16 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u090DWiL058109; Fri, 8 Jan 2016 19:13:33 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u090DUNj002858 for ; Fri, 8 Jan 2016 19:13:30 -0500 Received: from colepc.redhat.com (ovpn-113-33.phx2.redhat.com [10.3.113.33]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u090DSuB014481; Fri, 8 Jan 2016 19:13:30 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Fri, 8 Jan 2016 19:13:21 -0500 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] tests: Fix running schematests directly from topdir X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com Previously it failed like: $ ./tests/domainschematest ./tests/domainschematest: line 4: ./test-lib.sh: No such file or directory --- tests/capabilityschematest | 2 +- tests/domaincapsschematest | 2 +- tests/domainschematest | 2 +- tests/domainsnapshotschematest | 2 +- tests/interfaceschematest | 2 +- tests/networkschematest | 2 +- tests/nodedevschematest | 2 +- tests/nwfilterschematest | 2 +- tests/secretschematest | 2 +- tests/storagepoolschematest | 2 +- tests/storagevolschematest | 2 +- tests/test-lib.sh | 9 +++++---- 12 files changed, 16 insertions(+), 15 deletions(-) -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/capabilityschematest b/tests/capabilityschematest index 4439842..78fbc8e 100755 --- a/tests/capabilityschematest +++ b/tests/capabilityschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/domaincapsschematest b/tests/domaincapsschematest index 9baf44a..2c19ac4 100755 --- a/tests/domaincapsschematest +++ b/tests/domaincapsschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/domainschematest b/tests/domainschematest index ba90180..31ee536 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/domainsnapshotschematest b/tests/domainsnapshotschematest index 1bdc539..ba28e05 100755 --- a/tests/domainsnapshotschematest +++ b/tests/domainsnapshotschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/interfaceschematest b/tests/interfaceschematest index 1ddbc53..47745ea 100755 --- a/tests/interfaceschematest +++ b/tests/interfaceschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/networkschematest b/tests/networkschematest index 46f3fc5..fe46893 100755 --- a/tests/networkschematest +++ b/tests/networkschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/nodedevschematest b/tests/nodedevschematest index 03a1577..07b1f7b 100755 --- a/tests/nodedevschematest +++ b/tests/nodedevschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/nwfilterschematest b/tests/nwfilterschematest index 2c50c03..8703e21 100755 --- a/tests/nwfilterschematest +++ b/tests/nwfilterschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/secretschematest b/tests/secretschematest index f64d1a3..23b0e2f 100755 --- a/tests/secretschematest +++ b/tests/secretschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/storagepoolschematest b/tests/storagepoolschematest index d54b827..ebea711 100755 --- a/tests/storagepoolschematest +++ b/tests/storagepoolschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/storagevolschematest b/tests/storagevolschematest index 9045e6b..395df57 100755 --- a/tests/storagevolschematest +++ b/tests/storagevolschematest @@ -1,6 +1,6 @@ #!/bin/sh -: ${srcdir=.} +: ${srcdir=$(dirname $0)} . $srcdir/test-lib.sh . $abs_srcdir/schematestutils.sh diff --git a/tests/test-lib.sh b/tests/test-lib.sh index aff179c..920b01e 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -18,10 +18,11 @@ # # Based on an idea from GNU coreutils -test -z "$abs_srcdir" && abs_srcdir=$(pwd) -test -z "$abs_builddir" && abs_builddir=$(pwd) -test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. -test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/.. +_scriptdir="$(realpath $(dirname $0))" +test -z "$abs_srcdir" && abs_srcdir=$_scriptdir +test -z "$abs_builddir" && abs_builddir=$_scriptdir +test -z "$abs_top_srcdir" && abs_top_srcdir=$_scriptdir/.. +test -z "$abs_top_builddir" && abs_top_builddir=$_scriptdir/.. test -z "$LC_ALL" && LC_ALL=C # Skip this test if the shell lacks support for functions.