From d76bbdab91785cfb66358edf0f243bd89d756257 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 20 Jul 2000 02:23:00 +0000 Subject: [PATCH] Replace diff -q with diff >/dev/null for portability reasons --- tests/scripts/defines.sh | 4 ++-- tests/scripts/test001-slapadd | 2 +- tests/scripts/test002-populate | 2 +- tests/scripts/test003-search | 2 +- tests/scripts/test004-modify | 2 +- tests/scripts/test005-modrdn | 10 +++++----- tests/scripts/test006-acls | 2 +- tests/scripts/test007-replication | 2 +- tests/scripts/test008-concurrency | 2 +- tests/scripts/test009-referral | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index b772af34b1..cc56ee7e75 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -31,8 +31,8 @@ CLIENTDIR=../clients/tools LDIF2LDBM="../servers/slapd/tools/slapadd $LDAP_VERBOSE" -#CMP=cmp -CMP="diff -i -q" +CMP="diff -i" +CMPOUT=/dev/null SLAPD=../servers/slapd/slapd SLURPD=../servers/slurpd/slurpd LDAPPASSWD="$CLIENTDIR/ldappasswd $TOOLARGS" diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index 052624be7c..628a7f7c34 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -54,7 +54,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate index fdf62cb97d..8846768828 100755 --- a/tests/scripts/test002-populate +++ b/tests/scripts/test002-populate @@ -58,7 +58,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index bced8e1fbb..8d536378cb 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -93,7 +93,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "Comparison failed" diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index f485007de7..73fb373f5f 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -135,7 +135,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modify operations did not complete correctly" diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index f72ccfdf6a..00c0705188 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -91,7 +91,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modrdn operations did not complete correctly" @@ -118,7 +118,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modrdn operations did not complete correctly" @@ -138,7 +138,7 @@ if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" exit $RC fi -$CMP $SEARCHOUT /dev/null +$CMP $SEARCHOUT /dev/null > $CMPOUT if test $? != 0 ; then echo "failure: ldapsearch found attribute that was to be removed!" kill -HUP $PID @@ -162,7 +162,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modrdn operations did not complete correctly" @@ -203,7 +203,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT kill -HUP $PID if test $? != 0 ; then diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index a9defa4414..ea756a2cdf 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -131,7 +131,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modify operations did not complete correctly" diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index f71a002120..870e683985 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -174,7 +174,7 @@ echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing retrieved entries from master and slave..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "test failed - master and slave databases differ" diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency index 8110d37e61..bfaacb9e77 100755 --- a/tests/scripts/test008-concurrency +++ b/tests/scripts/test008-concurrency @@ -72,7 +72,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index 745c9cff99..b2cb178288 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -113,7 +113,7 @@ echo "Filtering ldapsearch results..." echo "Filtering original ldif used to create database..." . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." -$CMP $SEARCHFLT $LDIFFLT +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "Comparison failed" -- 2.39.5