[llvm-commits] CVS: llvm/test/Programs/DiffOutput.sh

Brian Gaeke gaeke at cs.uiuc.edu
Sat Nov 8 16:43:00 PST 2003


Changes in directory llvm/test/Programs:

DiffOutput.sh updated: 1.12 -> 1.13

---
Log message:

Don't pick 'gdiff' to diff unless 'which' hands us back something
which really is an executable. :-\


---
Diffs of the changes:  (+7 -3)

Index: llvm/test/Programs/DiffOutput.sh
diff -u llvm/test/Programs/DiffOutput.sh:1.12 llvm/test/Programs/DiffOutput.sh:1.13
--- llvm/test/Programs/DiffOutput.sh:1.12	Sun Jun 22 15:21:04 2003
+++ llvm/test/Programs/DiffOutput.sh	Sat Nov  8 16:42:32 2003
@@ -12,11 +12,15 @@
 DIFFOUTPUT=Output/$2.diff-$1
 
 # Find gnu diff
+
+DIFF=diff
 if which gdiff > /dev/null 2>&1
 then
-  DIFF=gdiff
-else
-  DIFF=diff
+  where=`which gdiff 2>&1`
+  if [ -x "$where" ]
+  then
+    DIFF=gdiff
+  fi
 fi
 
 # Diff the two files.





More information about the llvm-commits mailing list