summaryrefslogtreecommitdiffstats
path: root/test-tool
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-04-15 21:43:20 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-04-16 08:32:44 +0100
commit5790f5bfafb12cc2ed9365461bf66e0fdfde7150 (patch)
tree3536d84023161f43882c4dd7df54f51f17ebe2f7 /test-tool
parent0108d7861d4cc9a1f0d87d89080d1be7750e54b5 (diff)
downloadlibguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.tar.gz
libguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.tar.xz
libguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.zip
Remove ad-hoc run*locally scripts, replace with './run'
Remove all the run*locally scripts and replace with a single top level ./run shell script.
Diffstat (limited to 'test-tool')
-rw-r--r--test-tool/Makefile.am2
-rwxr-xr-xtest-tool/run-test-tool-locally54
2 files changed, 1 insertions, 55 deletions
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index 5ce21642..1ed08208 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -17,7 +17,7 @@
include $(top_srcdir)/subdir-rules.mk
-EXTRA_DIST = libguestfs-test-tool.pod run-test-tool-locally
+EXTRA_DIST = libguestfs-test-tool.pod
CLEANFILES =
diff --git a/test-tool/run-test-tool-locally b/test-tool/run-test-tool-locally
deleted file mode 100755
index 21df4c57..00000000
--- a/test-tool/run-test-tool-locally
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2010-2011 Red Hat Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# This script sets up the environment so you can run
-# libguestfs-test-tool in place without needing to do 'make install'
-# first. You can also run the test tool by creating a symlink to this
-# script and putting it in your path.
-#
-# Normal use is like this:
-# ./run-test-tool-locally
-
-use strict;
-use warnings;
-
-use File::Basename qw(dirname);
-use File::Spec;
-use Cwd qw(abs_path);
-
-my $path = $0;
-my $tool = shift @ARGV;
-
-# Follow symlinks until we get to the real file
-while(-l $path) {
- my $link = readlink($path) or die "readlink: $path: $!";
- if(File::Spec->file_name_is_absolute($link)) {
- $path = $link;
- } else {
- $path = File::Spec->catfile(dirname($path), $link);
- }
-}
-
-# Get the absolute path of the parent directory
-$path = abs_path(dirname($path).'/..');
-
-$ENV{LD_LIBRARY_PATH} = $path.'/src/.libs';
-$ENV{LIBGUESTFS_PATH} = $path.'/appliance';
-
-exec("$path/test-tool/libguestfs-test-tool",
- "$path/test-tool/libguestfs-test-tool",
- @ARGV);