From 1e5a5921e326e05235afd92573722b53a3992cad Mon Sep 17 00:00:00 2001
From: Lars Karlitski <lars@karlitski.net>
Date: Tue, 21 May 2019 15:39:33 +0200
Subject: [PATCH] tests: Source lib.sh from the right directory

When testing in one of the VMs, tests are in /tests. Source the lib from
a relative directory instead.
---
 tests/cli/test_build_and_deploy_aws.sh       | 2 +-
 tests/cli/test_build_and_deploy_azure.sh     | 2 +-
 tests/cli/test_build_and_deploy_openstack.sh | 2 +-
 tests/cli/test_build_and_deploy_vmware.sh    | 2 +-
 tests/cli/test_compose_live-iso.sh           | 2 +-
 tests/cli/test_compose_qcow2.sh              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh
index df49b320..b409050a 100755
--- a/tests/cli/test_build_and_deploy_aws.sh
+++ b/tests/cli/test_build_and_deploy_aws.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 
diff --git a/tests/cli/test_build_and_deploy_azure.sh b/tests/cli/test_build_and_deploy_azure.sh
index 665dfed4..e408d6a5 100755
--- a/tests/cli/test_build_and_deploy_azure.sh
+++ b/tests/cli/test_build_and_deploy_azure.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 
diff --git a/tests/cli/test_build_and_deploy_openstack.sh b/tests/cli/test_build_and_deploy_openstack.sh
index c9ee5892..75167ccc 100755
--- a/tests/cli/test_build_and_deploy_openstack.sh
+++ b/tests/cli/test_build_and_deploy_openstack.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 
diff --git a/tests/cli/test_build_and_deploy_vmware.sh b/tests/cli/test_build_and_deploy_vmware.sh
index ba421acf..ec13cc4a 100755
--- a/tests/cli/test_build_and_deploy_vmware.sh
+++ b/tests/cli/test_build_and_deploy_vmware.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 
diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh
index ba657266..df4d1976 100755
--- a/tests/cli/test_compose_live-iso.sh
+++ b/tests/cli/test_compose_live-iso.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 QEMU="qemu-system-$(uname -m) -machine accel=kvm:tcg"
diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh
index d4788db9..6e14c8cb 100755
--- a/tests/cli/test_compose_qcow2.sh
+++ b/tests/cli/test_compose_qcow2.sh
@@ -8,7 +8,7 @@
 #####
 
 . /usr/share/beakerlib/beakerlib.sh
-. ./tests/cli/lib/lib.sh
+. $(dirname $0)/lib/lib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
 QEMU="qemu-system-$(uname -m) -machine accel=kvm:tcg"