[augeas-devel] [PATCH 2 of 2] Fix failures on FreeBSD

David Lutterkort dlutter at redhat.com
Tue Jul 29 23:53:40 UTC 2008


1 file changed, 2 insertions(+), 2 deletions(-)
tests/test-save-empty.sh |    4 ++--


# HG changeset patch
# User David Lutterkort <dlutter at redhat.com>
# Date 1217375601 25200
# Node ID 228520307992eb2b89d20673d1fa4c4e1a635280
# Parent  cd4ae60834eabdd880baec4f631dda193f5b8c45
Fix failures on FreeBSD

(1) Point augtool at the lenses in the source dir (not FreeBSD problem,
    happens whenever Augeas is not installed yet)
(2) Remove bashism 'echo $"..."' with 'echo -e "..."'

diff -r cd4ae60834ea -r 228520307992 tests/test-save-empty.sh
--- a/tests/test-save-empty.sh	Tue Jul 29 16:52:04 2008 -0700
+++ b/tests/test-save-empty.sh	Tue Jul 29 16:53:21 2008 -0700
@@ -4,7 +4,7 @@
 # but that we do create new files correctly
 
 save_hosts() {
-(augtool -r $ROOT | grep ^/augeas) <<EOF
+(augtool -r $ROOT -I $abs_top_srcdir/lenses | grep ^/augeas) <<EOF
 set /files/etc/hosts/1/ipaddr 127.0.0.1
 set /files/etc/hosts/1/canonical localhost
 save
@@ -46,7 +46,7 @@
     exit 1
 fi
 
-echo $'127.0.0.1\tlocalhost' > $HOSTS.expected
+echo -e '127.0.0.1\tlocalhost' > $HOSTS.expected
 
 if ! cmp $HOSTS $HOSTS.expected > /dev/null 2>&1 ; then
     echo "Contents of $HOSTS are incorrect"




More information about the augeas-devel mailing list