diff options
| author | Karel Zak | 2009-10-13 15:37:49 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-10-13 15:37:49 +0200 |
| commit | d4e0f2f2ad93124c01695c072e7a514ff8e27d2c (patch) | |
| tree | 020b80fd4631fa93887d8370c594431417a70da5 /tests/functions.sh | |
| parent | swapon: more robust progname probing (diff) | |
| download | kernel-qcow2-util-linux-d4e0f2f2ad93124c01695c072e7a514ff8e27d2c.tar.gz kernel-qcow2-util-linux-d4e0f2f2ad93124c01695c072e7a514ff8e27d2c.tar.xz kernel-qcow2-util-linux-d4e0f2f2ad93124c01695c072e7a514ff8e27d2c.zip | |
tests: swapon workaround for libtool wrapper
The swapon command behaviour depends on program name (argv[0] = swapon
| swapoff). It means we cannot use the libtool wrapper script in our
regression tests. It seems better to call the binaries directly with
proper LD_LIBRARY_PATH. This is probably less portable, but good
enough for our tests.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 50ef12d8c..e8a2ceb69 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -365,7 +365,8 @@ function ts_swapoff { ln -sf $TS_CMD_SWAPON $TS_CMD_SWAPOFF REMSWAPOFF="true" fi - $TS_CMD_SWAPOFF $DEV 2>&1 >> $TS_OUTPUT + LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ + $TS_CMD_SWAPOFF $DEV 2>&1 >> $TS_OUTPUT if [ -n "$REMSWAPOFF" ]; then rm -f $TS_CMD_SWAPOFF fi |