Namazu-devel-ja(旧)
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
make check OK with NetBSD (Re: ~/.mknmzrc)
笠原さん、NetBSD の (g)cc と gettext の設置先の件で、
お返事ありがとうございます。確かに /usr/include や /usr/lib に
libintl.h や libintl.a を入れてしまうのはどうか、というのは良く
分りました。
さて話は変りますが、僕のメールの
namazu-devel-ja: 00856 にて
From: 藤原 誠/ Makoto Fujiwara <makoto@xxxxx>
Subject: Re: Solaris/gettext (was: Road to 2.0.5)
Date: Mon, 25 Sep 2000 11:48:03 +0900
最後に書いた、
makoto> ちなみに、make check はある時には (setenv LANG C/japanese とも) fail/OK 10/27
makoto> と、とても成績が悪いので、少しも参考にならないかも知れません。まだそれ以上は
makoto> 調べていません。( test/2.0.5pre2 の話です)
の件ですが、自分の web 用にいろいろ書いてある ~/.mknmzrc の問題で
した。これの名前を変えたところ、27/27 で全て通りました。余計なこと
を書いて済みませんでした。仕事先でも同じようだっので、全く考えも
しなかったのですが、結局、似たようなことが書いてあったのだと思いま
す。
しかし初めは、 tests/test-log を見ても、どこがどの番号 (mknmz-?
など) に対応するのか分らず、添付の変更をして、実行して、やっと、
Nothing to index というのが (何か所にも) 書いてあるのを見付け、そ
の付近のものを手で実行して、やっと分ったという次第です。
きょう試したのは、
NetBSD/macppc 1.5E (iBook), kakasi-2.3.2 chasen-2.02
Network Kanji Filter Version 1.9 (2/0002/Shinji Kono) 確か 1.92
Text-Kakasi-1.04,Text-Chasen-1.03,
gettext-0.10.35 (config.guess,config.sub 入替)
namazu-2.0.5pre2
です。
tutorial.html に書いてある版が古くなっていますが、更新方法をすっか
り忘れています。(まず password を忘れているかも知れません)
---
(藤原)
diff -ur namazu-2.0.5/tests-ooo/mknmz-1 namazu-2.0.5/tests/mknmz-1
--- namazu-2.0.5/tests-ooo/mknmz-1 Thu Mar 2 19:53:30 2000
+++ namazu-2.0.5/tests/mknmz-1 Fri Sep 29 15:28:15 2000
@@ -10,8 +10,10 @@
else
rm -f idx1/NMZ.*
fi
-
# Simple indexing.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx1 $TARGET >> $LOG
exit $?
diff -ur namazu-2.0.5/tests-ooo/mknmz-10 namazu-2.0.5/tests/mknmz-10
--- namazu-2.0.5/tests-ooo/mknmz-10 Thu Jun 15 23:14:35 2000
+++ namazu-2.0.5/tests/mknmz-10 Fri Sep 29 15:30:45 2000
@@ -23,6 +23,9 @@
echo '$conf::ALLOW_FILE=".*\\.txt"' > $tmprc
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx12 $TARGET >> $LOG 2>&1
./mknmz --allow='.*\.html' -O ../tests/idx13 $TARGET >> $LOG 2>&1
rm $tmprc
diff -ur namazu-2.0.5/tests-ooo/mknmz-2 namazu-2.0.5/tests/mknmz-2
--- namazu-2.0.5/tests-ooo/mknmz-2 Wed Apr 5 08:56:00 2000
+++ namazu-2.0.5/tests/mknmz-2 Fri Sep 29 15:28:27 2000
@@ -10,8 +10,10 @@
else
rm -f idx2/NMZ.*
fi
-
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
targets=`cat ../tests/idx1/NMZ.field.uri`
for target in $targets; do
diff -ur namazu-2.0.5/tests-ooo/mknmz-3 namazu-2.0.5/tests/mknmz-3
--- namazu-2.0.5/tests-ooo/mknmz-3 Thu Mar 2 19:53:30 2000
+++ namazu-2.0.5/tests/mknmz-3 Fri Sep 29 15:28:38 2000
@@ -10,13 +10,15 @@
else
rm -f idx3/NMZ.*
fi
-
pwd=`pwd`
tmprc="$pwd/mknmzrc"
echo '$conf::ON_MEMORY_MAX=0' > $tmprc
# Simple indexing
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz --checkpoint -f $tmprc -O ../tests/idx3 $TARGET >> $LOG
rm -f $tmprc
diff -ur namazu-2.0.5/tests-ooo/mknmz-4 namazu-2.0.5/tests/mknmz-4
--- namazu-2.0.5/tests-ooo/mknmz-4 Thu Sep 14 14:42:38 2000
+++ namazu-2.0.5/tests/mknmz-4 Fri Sep 29 15:29:03 2000
@@ -20,6 +20,9 @@
# Simple indexing.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx4 $TMPDATA >> $LOG
test "$?" != "0" && exit 1 # error if not success
diff -ur namazu-2.0.5/tests-ooo/mknmz-5 namazu-2.0.5/tests/mknmz-5
--- namazu-2.0.5/tests-ooo/mknmz-5 Thu Sep 14 14:42:46 2000
+++ namazu-2.0.5/tests/mknmz-5 Fri Sep 29 15:29:11 2000
@@ -20,6 +20,9 @@
# Simple indexing.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx7 $TMPDATA >> $LOG
test "$?" != "0" && exit 1 # error if not success
diff -ur namazu-2.0.5/tests-ooo/mknmz-6 namazu-2.0.5/tests/mknmz-6
--- namazu-2.0.5/tests-ooo/mknmz-6 Sun Mar 12 15:14:15 2000
+++ namazu-2.0.5/tests/mknmz-6 Fri Sep 29 15:29:23 2000
@@ -13,5 +13,8 @@
# Simple indexing.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx8 $TARGET >> $LOG
exit $?
diff -ur namazu-2.0.5/tests-ooo/mknmz-7 namazu-2.0.5/tests/mknmz-7
--- namazu-2.0.5/tests-ooo/mknmz-7 Wed Apr 26 11:44:57 2000
+++ namazu-2.0.5/tests/mknmz-7 Fri Sep 29 15:29:31 2000
@@ -13,6 +13,9 @@
# Indexing with --html-split option.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz --html-split -O ../tests/idx9 $TARGET >> $LOG
exit $?
diff -ur namazu-2.0.5/tests-ooo/mknmz-8 namazu-2.0.5/tests/mknmz-8
--- namazu-2.0.5/tests-ooo/mknmz-8 Wed Apr 26 19:16:44 2000
+++ namazu-2.0.5/tests/mknmz-8 Fri Sep 29 15:29:43 2000
@@ -20,6 +20,9 @@
# Index with --html-split option.
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz --html-split -O ../tests/idx10 $TMPDATA >> $LOG
test "$?" != "0" && exit 1 # error if not success
origdocnum=`./gtnmz ../tests/idx10/NMZ.r`
diff -ur namazu-2.0.5/tests-ooo/mknmz-9 namazu-2.0.5/tests/mknmz-9
--- namazu-2.0.5/tests-ooo/mknmz-9 Tue May 23 11:23:59 2000
+++ namazu-2.0.5/tests/mknmz-9 Fri Sep 29 15:29:50 2000
@@ -13,6 +13,9 @@
fi
cd ../scripts
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
./mknmz -O ../tests/idx11 $TARGET >> $LOG 2>&1 &
i=20
diff -ur namazu-2.0.5/tests-ooo/namazu-1 namazu-2.0.5/tests/namazu-1
--- namazu-2.0.5/tests-ooo/namazu-1 Sun Feb 27 16:42:04 2000
+++ namazu-2.0.5/tests/namazu-1 Fri Sep 29 15:31:16 2000
@@ -13,6 +13,9 @@
# Check the number of retrieved documents.
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
hitnum=`./namazu -c namazu ../tests/idx1`
echo "docnum:" $docnum, "hitnum:" $hitnum >> $LOG
test "$docnum" != "$hitnum" && exit 1 # error if not matched
diff -ur namazu-2.0.5/tests-ooo/namazu-2 namazu-2.0.5/tests/namazu-2
--- namazu-2.0.5/tests-ooo/namazu-2 Sun Feb 27 16:42:04 2000
+++ namazu-2.0.5/tests/namazu-2 Fri Sep 29 15:31:08 2000
@@ -14,6 +14,10 @@
# Check the number of retrieved documents.
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
+
hitnum=`./namazu -c namazu ../tests/idx1 ../tests/idx2`
echo "docnum:" $docnum, "hitnum:" $hitnum >> $LOG
test "$docnum" != "$hitnum" && exit 1 # error if not matched
diff -ur namazu-2.0.5/tests-ooo/namazu-3 namazu-2.0.5/tests/namazu-3
--- namazu-2.0.5/tests-ooo/namazu-3 Sun Feb 27 16:42:04 2000
+++ namazu-2.0.5/tests/namazu-3 Fri Sep 29 15:31:24 2000
@@ -13,6 +13,9 @@
# Check the number of retrieved documents.
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
hitnum=`./namazu -c namazu ../tests/idx4`
echo "docnum:" $docnum, "hitnum:" $hitnum >> $LOG
test "$docnum" != "$hitnum" && exit 1 # error if not matched
diff -ur namazu-2.0.5/tests-ooo/namazu-4 namazu-2.0.5/tests/namazu-4
--- namazu-2.0.5/tests-ooo/namazu-4 Sun Feb 27 16:45:51 2000
+++ namazu-2.0.5/tests/namazu-4 Fri Sep 29 15:31:31 2000
@@ -13,6 +13,9 @@
# Check the number of retrieved documents.
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
hitnum=`./namazu -c xyzzy ../tests/idx7`
echo "docnum:" $docnum, "hitnum:" $hitnum >> $LOG
test "$docnum" != "$hitnum" && exit 1 # error if not matched
diff -ur namazu-2.0.5/tests-ooo/namazu-5 namazu-2.0.5/tests/namazu-5
--- namazu-2.0.5/tests-ooo/namazu-5 Fri Apr 7 10:48:22 2000
+++ namazu-2.0.5/tests/namazu-5 Fri Sep 29 15:51:24 2000
@@ -6,6 +6,9 @@
docnum=`perl -lne 'print $1 if /^files (\d+)/' idx1/NMZ.status`
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
# No query, no results.
# FIXME: Is it a good behavior?
diff -ur namazu-2.0.5/tests-ooo/namazu-6 namazu-2.0.5/tests/namazu-6
--- namazu-2.0.5/tests-ooo/namazu-6 Sun Mar 12 15:16:25 2000
+++ namazu-2.0.5/tests/namazu-6 Fri Sep 29 15:51:45 2000
@@ -27,6 +27,9 @@
cat $M1 $M3 > $M13
cat $M2 $M3 > $M23
cat $M1 $M2 $M3 > $M123
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
#
# Check WORD searching.
diff -ur namazu-2.0.5/tests-ooo/namazu-7 namazu-2.0.5/tests/namazu-7
--- namazu-2.0.5/tests-ooo/namazu-7 Wed Apr 26 11:44:57 2000
+++ namazu-2.0.5/tests/namazu-7 Fri Sep 29 15:51:53 2000
@@ -8,6 +8,10 @@
# All parts should have "test".
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
+
hitnum=`./namazu -c test ../tests/idx9`
echo "docnum:" $docnum, "hitnum:" $hitnum >> $LOG
test "$docnum" != "$hitnum" && exit 1 # error if not matched
diff -ur namazu-2.0.5/tests-ooo/namazu-8 namazu-2.0.5/tests/namazu-8
--- namazu-2.0.5/tests-ooo/namazu-8 Wed Apr 26 11:30:52 2000
+++ namazu-2.0.5/tests/namazu-8 Fri Sep 29 15:52:00 2000
@@ -6,6 +6,10 @@
# `amarok' should be found.
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
+
./namazu -l 'amarok' ../tests/idx10 | grep '1\.html#quux' > /dev/null || exit 1
# `xyzzy' should NOT be found.
diff -ur namazu-2.0.5/tests-ooo/namazu-9 namazu-2.0.5/tests/namazu-9
--- namazu-2.0.5/tests-ooo/namazu-9 Fri Jun 16 15:08:34 2000
+++ namazu-2.0.5/tests/namazu-9 Fri Sep 29 15:52:09 2000
@@ -16,6 +16,9 @@
unset LC_MESSAGES
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
# Tests for MaxHit.
# foo => 1 page indexed.
diff -ur namazu-2.0.5/tests-ooo/namazu-cgi-1 namazu-2.0.5/tests/namazu-cgi-1
--- namazu-2.0.5/tests-ooo/namazu-cgi-1 Mon Apr 10 13:07:26 2000
+++ namazu-2.0.5/tests/namazu-cgi-1 Fri Sep 29 15:52:40 2000
@@ -15,6 +15,10 @@
export SCRIPT_NAME QUERY_STRING
cd ../src
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
+
hitnum=`./namazu.cgi | perl -ne 'print $1 if /<!-- HIT -->(\d+)<!-- HIT -->/'`
rm -f $tmprc
diff -ur namazu-2.0.5/tests-ooo/namazu-cgi-2 namazu-2.0.5/tests/namazu-cgi-2
--- namazu-2.0.5/tests-ooo/namazu-cgi-2 Mon Apr 10 13:07:26 2000
+++ namazu-2.0.5/tests/namazu-cgi-2 Fri Sep 29 15:53:19 2000
@@ -16,6 +16,9 @@
SCRIPT_NAME='namazu.cgi'
QUERY_STRING='query=namazu&idxname=idx1&idxname=idx2'
export SCRIPT_NAME QUERY_STRING
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
cd ../src
hitnum=`./namazu.cgi | perl -ne 'print $1 if /<!-- HIT -->(\d+)<!-- HIT -->/'`
diff -ur namazu-2.0.5/tests-ooo/namazu-cgi-3 namazu-2.0.5/tests/namazu-cgi-3
--- namazu-2.0.5/tests-ooo/namazu-cgi-3 Mon Apr 10 13:07:26 2000
+++ namazu-2.0.5/tests/namazu-cgi-3 Fri Sep 29 15:53:31 2000
@@ -14,6 +14,9 @@
cd ../src
SCRIPT_NAME='namazu.cgi'
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
for query in '%3C' '%3E' '%3C%3E' '%3E%3C' '%26' '%22' '%3C%22%26%3E' \
'<' '>' '<>' '><' # '&' '"' '<"&>' \
diff -ur namazu-2.0.5/tests-ooo/namazu-cgi-4 namazu-2.0.5/tests/namazu-cgi-4
--- namazu-2.0.5/tests-ooo/namazu-cgi-4 Fri Jun 16 15:08:34 2000
+++ namazu-2.0.5/tests/namazu-cgi-4 Fri Sep 29 15:53:45 2000
@@ -26,6 +26,9 @@
REMOTE_HOST='foo.bar.jp'
REMOTE_ADDR='1.2.3.4'
export REMOTE_HOST REMOTE_ADDR
+echo '# -----------------------' >> $LOG
+echo "# $0 " >> $LOG
+echo '# -----------------------' >> $LOG
cd ../src