git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-s200->-s2000
[nethome.git]
/
bin
/
diffgdbdir
diff --git
a/bin/diffgdbdir
b/bin/diffgdbdir
index
1866de2
..
2f2ab2d
100755
(executable)
--- a/
bin/diffgdbdir
+++ b/
bin/diffgdbdir
@@
-1,16
+1,26
@@
#! /bin/sh
x="*.log"
#! /bin/sh
x="*.log"
-o="-f"
-if [ "$1" = "-r" ];then
- o="-r"
- shift
-fi
-if [ "$1" = "log" ];then
- x="*.sum"
- o="-r"
- shift
-fi
+o=""
+while true;do
+ if [ "$1" = "-r" ];then
+ o="$o -r"
+ shift
+ continue
+ fi
+ if [ "$1" = "-N" ];then
+ o="$o -N"
+ shift
+ continue
+ fi
+ if [ "$1" = "log" -o "$1" = "-l" ];then
+ x="*.sum"
+ o="-r"
+ shift
+ continue
+ fi
+ break
+done
if [ $# != 2 ];then
echo >&2 "$0 hammock/xxxxyyzzname hammock/XXXXYYZZothername"
if [ $# != 2 ];then
echo >&2 "$0 hammock/xxxxyyzzname hammock/XXXXYYZZothername"
@@
-18,34
+28,42
@@
if [ $# != 2 ];then
fi
diffed=false
fi
diffed=false
-function diffit
+function diffit
raw
{
{
- dir1=$1
/out
- dir2=$2
/out
+ dir1=$1
+ dir2=$2
if [ ! -e "$dir2" ];then
echo "MISSING: $dir1 $dir2"
return
fi
if [ ! -e "$dir2" ];then
echo "MISSING: $dir1 $dir2"
return
fi
- diffgdb $o -x "$x" $dir1 $dir2
+ diffgdb $o -x
rpm-qa -x
"$x" $dir1 $dir2
diffed=true
}
diffed=true
}
+function diffit
+{
+ diffitraw $1/out $2/out
+}
-if [ -f "$1" -a ! -e "${1%.tar.xz}" ];then
- (
- cd "$(dirname "$1")"
- tar xJf "$(basename "$1")"
- )
+if [ -f "$1" ];then
+ if [ ! -e "${1%.tar.xz}" ];then
+ (
+ cd "$(dirname "$1")"
+ tar xJf "$(basename "$1")"
+ )
+ fi
set "${1%.tar.xz}" "$2"
if [ ! -d "$1" ];then
echo "! $1"
exit 1
fi
fi
set "${1%.tar.xz}" "$2"
if [ ! -d "$1" ];then
echo "! $1"
exit 1
fi
fi
-if [ -f "$2" -a ! -e "${2%.tar.xz}" ];then
- (
- cd "$(dirname "$2")"
- tar xJf "$(basename "$2")"
- )
+if [ -f "$2" ];then
+ if [ ! -e "${2%.tar.xz}" ];then
+ (
+ cd "$(dirname "$2")"
+ tar xJf "$(basename "$2")"
+ )
+ fi
set "$1" "${2%.tar.xz}"
if [ ! -d "$2" ];then
echo "! $2"
set "$1" "${2%.tar.xz}"
if [ ! -d "$2" ];then
echo "! $2"
@@
-68,6
+86,10
@@
if [ -d $1/out ];then
diffit $1 $2
diffed=true
fi
diffit $1 $2
diffed=true
fi
+if [ "$1" != "${1#tests/}" -a -d $1 ];then
+ diffitraw $1 $2
+ diffed=true
+fi
if ! $diffed;then
echo "NOT FOUND: $1 $2"
fi
if ! $diffed;then
echo "NOT FOUND: $1 $2"
fi