[71041] trunk/base/tests

[raimue at macports.org]

Revision: 71041
          http://trac.macports.org/changeset/71041
Author:   raimue at macports.org
Date:     2010-08-30 07:31:35 -0700 (Mon, 30 Aug 2010)
Log Message:
-----------
tests: Use unified diff format everywhere; generate diff from master to output

Modified Paths:
--------------
    trunk/base/tests/Makefile
    trunk/base/tests/test/envvariables/Makefile
    trunk/base/tests/test/trace/Makefile
    trunk/base/tests/test/universal/Makefile
    trunk/base/tests/test/universal-2/Makefile

Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile	2010-08-30 14:28:41 UTC (rev 71040)
+++ trunk/base/tests/Makefile	2010-08-30 14:31:35 UTC (rev 71041)
@@ -53,7 +53,7 @@
 				PORTSRC=$(PWD)/test-macports.conf $(bindir)/port test > output 2>&1 \
 					|| ([ -e error_expected ] || (cat output; exit 1)) && \
 			sed -e "s|${PWD}|PWD|g" < output > output.sed && \
-			diff -u output.sed master 2>&1 | tee difference && \
+			diff -u master output.sed 2>&1 | tee difference && \
 			if [ -s difference ]; then \
 				exit 1; \
 			else \

Modified: trunk/base/tests/test/envvariables/Makefile
===================================================================
--- trunk/base/tests/test/envvariables/Makefile	2010-08-30 14:28:41 UTC (rev 71040)
+++ trunk/base/tests/test/envvariables/Makefile	2010-08-30 14:31:35 UTC (rev 71041)
@@ -10,7 +10,7 @@
 	@PORTSRC=$(PORTSRC) $(bindir)/port clean > /dev/null
 	@sh -c "export ENVA=A ; export ENVB=B; \
 		export PORTSRC=$(PORTSRC); $(bindir)/port -t test" > output 2>&1 || (cat output; exit 1)
-	@diff output master 2>&1 | tee difference
+	@diff -u master output 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \
 	else \

Modified: trunk/base/tests/test/trace/Makefile
===================================================================
--- trunk/base/tests/test/trace/Makefile	2010-08-30 14:28:41 UTC (rev 71040)
+++ trunk/base/tests/test/trace/Makefile	2010-08-30 14:31:35 UTC (rev 71041)
@@ -29,9 +29,9 @@
 	@rm -rf rmdir-trace
 	@rm -f /tmp/hello-trace
 	@sed -e "s|${PWD}|PWD|g" < output > output.sed
-	@diff output.sed master 2>&1 | tee difference
+	@diff -u master output.sed 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \
 	else \
 		rm -f difference output.sed; \
-	fi
\ No newline at end of file
+	fi

Modified: trunk/base/tests/test/universal/Makefile
===================================================================
--- trunk/base/tests/test/universal/Makefile	2010-08-30 14:28:41 UTC (rev 71040)
+++ trunk/base/tests/test/universal/Makefile	2010-08-30 14:31:35 UTC (rev 71041)
@@ -9,7 +9,7 @@
 test:
 	@PORTSRC=$(PORTSRC) $(bindir)/port clean > /dev/null
 	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info --variants" > output 2>&1 || (cat output; exit 1)
-	@diff output master 2>&1 | tee difference
+	@diff -u master output 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \
 	else \

Modified: trunk/base/tests/test/universal-2/Makefile
===================================================================
--- trunk/base/tests/test/universal-2/Makefile	2010-08-30 14:28:41 UTC (rev 71040)
+++ trunk/base/tests/test/universal-2/Makefile	2010-08-30 14:31:35 UTC (rev 71041)
@@ -9,7 +9,7 @@
 test:
 	@PORTSRC=$(PORTSRC) $(bindir)/port clean > /dev/null
 	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info --variants" > output 2>&1 || (cat output; exit 1)
-	@diff output master 2>&1 | tee difference
+	@diff -u master output 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \
 	else \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100830/9b1208fb/attachment.html>