annotate lib-src/vcdiff @ 4857:34ff4dd7397d

Add ChangeLog entries for previous changes to tests dir -------------------- ChangeLog entries follow: -------------------- tests/ChangeLog addition: 2010-01-14 Ben Wing <ben@xemacs.org> * automated/base64-tests.el (bt-base64-encode-string): * automated/base64-tests.el (bt-base64-decode-string): * automated/base64-tests.el (for): * automated/byte-compiler-tests.el: * automated/byte-compiler-tests.el (before-and-after-compile-equal): * automated/case-tests.el: * automated/case-tests.el (downcase-string): * automated/case-tests.el (insert): * automated/case-tests.el (featurep): * automated/case-tests.el (let): * automated/case-tests.el (boundp): * automated/ccl-tests.el (ccl-test-normal-expr): * automated/ccl-tests.el (ccl-test-map-instructions): * automated/ccl-tests.el (ccl-test-suites): * automated/database-tests.el (delete-database-files): * automated/extent-tests.el (let): * automated/extent-tests.el (insert): * automated/extent-tests.el (props): * automated/hash-table-tests.el (test): * automated/hash-table-tests.el (for): * automated/hash-table-tests.el (ht): * automated/hash-table-tests.el (iterations): * automated/hash-table-tests.el (h1): * automated/hash-table-tests.el (make-hash-table): * automated/hash-table-tests.el (sxhash): * automated/lisp-tests.el: * automated/lisp-tests.el (setq): * automated/lisp-tests.el (test-setq): * automated/lisp-tests.el (my-vector): * automated/lisp-tests.el (nconc): * automated/lisp-tests.el (x): * automated/lisp-tests.el (y): * automated/lisp-tests.el (butlast): * automated/lisp-tests.el (+): * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (-): * automated/lisp-tests.el (six): * automated/lisp-tests.el (three): * automated/lisp-tests.el (1): * automated/lisp-tests.el (one): * automated/lisp-tests.el (two): * automated/lisp-tests.el (0): * automated/lisp-tests.el (five): * automated/lisp-tests.el (logxor): * automated/lisp-tests.el (test1): * automated/lisp-tests.el (division-test): * automated/lisp-tests.el (for): * automated/lisp-tests.el (check-function-argcounts): * automated/lisp-tests.el (type-of): * automated/lisp-tests.el (mapcar): * automated/lisp-tests.el (z): * automated/lisp-tests.el (mapvector): * automated/lisp-tests.el (mapconcat): * automated/lisp-tests.el ([1 2 3]): * automated/lisp-tests.el (#*010): * automated/lisp-tests.el (test-harness-risk-infloops): * automated/lisp-tests.el (erase-buffer): * automated/lisp-tests.el (sym): * automated/lisp-tests.el (subseq): * automated/lisp-tests.el (length): * automated/lisp-tests.el (102): * automated/lisp-tests.el (read): * automated/lisp-tests.el (new-char): * automated/lisp-tests.el (new-load-file-name): * automated/lisp-tests.el (cl-floor): * automated/lisp-tests.el (foo): * automated/lisp-tests.el (string-variable): * automated/md5-tests.el (lambda): * automated/md5-tests.el (large-string): * automated/md5-tests.el (mapcar): * automated/md5-tests.el (insert): * automated/mule-tests.el (test-chars): * automated/mule-tests.el (existing-file-name): * automated/mule-tests.el (featurep): * automated/query-coding-tests.el (featurep): * automated/regexp-tests.el: * automated/regexp-tests.el (insert): * automated/regexp-tests.el (Assert): * automated/regexp-tests.el (string-match): * automated/regexp-tests.el (featurep): * automated/regexp-tests.el (text): * automated/regexp-tests.el (text1): * automated/regexp-tests.el ("aáa"): * automated/symbol-tests.el: * automated/symbol-tests.el (name): * automated/symbol-tests.el (check-weak-list-unique): * automated/symbol-tests.el (string): * automated/symbol-tests.el (list): * automated/symbol-tests.el (foo): * automated/symbol-tests.el (read): * automated/symbol-tests.el (eval): * automated/symbol-tests.el (fresh-keyword-name): * automated/symbol-tests.el (set): * automated/symbol-tests.el (print-gensym): * automated/symbol-tests.el (mysym): * automated/syntax-tests.el (test-forward-word): * automated/syntax-tests.el (test-backward-word): * automated/syntax-tests.el (test-syntax-table): * automated/syntax-tests.el (with-syntax-table): * automated/syntax-tests.el (Skip-Test-Unless): * automated/syntax-tests.el (with): * automated/tag-tests.el (testfile): * automated/test-harness.el: * automated/test-harness.el (test-harness-from-buffer): * automated/weak-tests.el (w): * automated/weak-tests.el (p): * automated/weak-tests.el (a): Create Assert-eq, Assert-equal, etc. These are equivalent to (Assert (eq ...)) etc. but display both the actual value and the expected value of the comparison. Use them throughout the test suite. * automated/test-harness.el (Assert): Clean up code and doc string of macro Assert.
author Ben Wing <ben@xemacs.org>
date Thu, 14 Jan 2010 02:34:47 -0600
parents 376386a54a3c
children 061f4f90f874 06dd936cde16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # Enhanced sccs diff utility for use with vc mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 # This version is more compatible with rcsdiff(1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # * Made sure that file arguments are specifed as s.<filename>.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # * Switched the assignments to $f inside the 3rd and 4th case statements of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # the first for-loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # * Removed the incorrect initialization of sid1 before the first for-loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 DIFF="diff"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 echo=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 sid1= sid2=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 -*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 --brief)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 DIFF=cmp;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 -q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 echo=:;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 -r?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 case $sid1 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 -r*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 sid2=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ?*) echo "$usage" >&2; exit 2 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 sid1=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 options="$options $f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 case $# in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 echo "$usage" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 exit 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 rev1= rev2= status=0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 trap 'status=2; exit' 1 2 13 15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 s=2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 # For files under SCCS control, fixup the file name to be the s. filename
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 if [ -d SCCS ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 f="SCCS/s.$f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 s.* | */s.*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 rev1=/tmp/geta$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 get -s -p -k $sid1 "$f" > $rev1 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 '')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 workfile=`expr " /$f" : '.*/s.\(.*\)'`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 rev2=/tmp/getb$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 get -s -p -k $sid2 "$f" > $rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 workfile=$rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 $echo $DIFF $options $sid1 $sid2 $workfile >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 $DIFF $options $rev1 $workfile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 s=$?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 echo "$0: $f is not an SCCS file" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 if test $status -lt $s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 then status=$s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 done