Index: trunk/test/test.sh =================================================================== --- trunk/test/test.sh (revision 474) +++ trunk/test/test.sh (revision 481) @@ -151,4 +151,7 @@ echo " ${S}test.sh 9${E} -- Process check" echo " ${S}test.sh 10${E} -- Port check" + echo " ${S}test.sh 11${E} -- CL verify option" + echo " ${S}test.sh 12${E} -- CL create DeltaDB" + echo " ${S}test.sh 13${E} -- CL create/verify partial DB" echo " ${S}test.sh 20${E} -- Test c/s init/check (testrc_2.in)" @@ -157,4 +160,7 @@ echo " ${S}test.sh 23${E} -- Test full c/s w/mysql (testrc_2.in)" echo " ${S}test.sh 24${E} -- Test full c/s w/postgres (testrc_2.in)" + echo " ${S}test.sh 25${E} -- Test server w/yulectl (testrc_2.in)" + echo " ${S}test.sh 26${E} -- Test c/s case one (testrc_2.in)" + echo " ${S}test.sh 27${E} -- Test c/s case two (testrc_2.in)" echo " ${S}test.sh all${E} -- All tests" } @@ -164,7 +170,8 @@ echo " (1) testcompile.sh (2) testhash.sh (3) testrun_1.sh (4) testrun_1a.sh" echo " (5) testext.sh (6) testtimesrv.sh (7) testrun_1b.sh (8) testrun_1c.sh" - echo " (9) testrun_1d.sh (10) testrun_1e.sh" + echo " (9) testrun_1d.sh (10) testrun_1e.sh (11) testrun_1f.sh (12) testrun_1g.sh" + echo " (13) testrun_1h.sh" echo " (20) testrun_2.sh (21) testrun_2a.sh (22) testrun_2b.sh (23) testrun_2c.sh" - echo " (24) testrun_2d.sh" + echo " (24) testrun_2d.sh (25) testrun_2e.sh (26) testrun_2f.sh (27) testrun_2g.sh" } @@ -434,4 +441,5 @@ rm -f testrc_1ext rm -f ./.samhain_file + rm -f file.*.*-*-*-*-* rm -f ./.samhain_log* rm -f ./.samhain_lock* @@ -446,4 +454,6 @@ rm -f yule.html2 rm -f test_dnmalloc + rm -f tmp_list_file + rm -f test_filter.txt } @@ -626,4 +636,25 @@ exit $? fi +if test x$1 = x11; then + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1f.sh + testrun1f + print_summary + exit $? +fi +if test x$1 = x12; then + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1g.sh + testrun1g + print_summary + exit $? +fi +if test x$1 = x13; then + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1h.sh + testrun1h + print_summary + exit $? +fi if test x$1 = x20; then . ${SCRIPTDIR}/testrun_2.sh @@ -659,4 +690,22 @@ exit $? fi +if test x$1 = x25; then + . ${SCRIPTDIR}/testrun_2e.sh + testrun2e $hostname + print_summary + exit $? +fi +if test x$1 = x26; then + . ${SCRIPTDIR}/testrun_2f.sh + testrun2f $hostname + print_summary + exit $? +fi +if test x$1 = x27; then + . ${SCRIPTDIR}/testrun_2g.sh + testrun2g $hostname + print_summary + exit $? +fi if test x$1 = xall; then TEST_MAX=0 @@ -681,4 +730,10 @@ . ${SCRIPTDIR}/testrun_1e.sh let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_1f.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_1g.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_1h.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null . ${SCRIPTDIR}/testrun_2.sh let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null @@ -690,4 +745,10 @@ let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null . ${SCRIPTDIR}/testrun_2d.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_2e.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_2f.sh + let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null + . ${SCRIPTDIR}/testrun_2g.sh let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null # @@ -734,4 +795,19 @@ testrun1e # + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1f.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun1f + # + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1g.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun1g + # + . ${SCRIPTDIR}/testrun_1.sh + . ${SCRIPTDIR}/testrun_1h.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun1h + # . ${SCRIPTDIR}/testrun_2.sh MAXTEST=${TEST_MAX}; export MAXTEST @@ -753,4 +829,16 @@ MAXTEST=${TEST_MAX}; export MAXTEST testrun2d $hostname + # + . ${SCRIPTDIR}/testrun_2e.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun2e $hostname + # + . ${SCRIPTDIR}/testrun_2f.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun2f $hostname + # + . ${SCRIPTDIR}/testrun_2g.sh + MAXTEST=${TEST_MAX}; export MAXTEST + testrun2g $hostname # print_summary @@ -768,33 +856,43 @@ __ARCHIVE_FOLLOWS__ -‹£ÉúDí•ÏoãDÇœ UbN\'€‘8*Û:IӔJ‘pãÔ-›ŠùєBU!o2M -þ‘z&éf/ˆ‚#§šgGâßa%7U$ĉHš‡U{àÚš -ã$M¶Ûª‚.¬4Ù -ϛ™÷Þ×3ž!39•Î€§dœänž2;3ã”.Ÿ—ïÕ]ýzïÕëóq.~Æ7ëqû\³ -môž< -äo'q²˜È&„œ)+:2¯ê‡L| -Ÿ˜aù’p×a!(-‡aDŠÀø²Šp% -R°×–dŒ3ãK‚ +‹p{Uí•=lÛFÇé©Å!sÑ-di‘D&%‹r +#QŽ™Ö— +نQ0҉bÍ•€d+Kеk—¢@75k塀l}!KaDÔ™:µC=öÐՂ“ +¥Ø–RA +8MûÄñþw÷ã;َ•ñ(Å#ÛêR 1ìܜ[2?=^º0þ@€bŒ~ËÒ^ÆÇR4ãcX–‚ôåž3IÑvd +BʒUY¯î÷ºöÿ)7]n +bD‚11“QBpIH&yQ6‚EÙÎ/Àä"ÏÉtBž&ع€² +pÍ,B¡,bL„Ž KÈRseèäUêȶe6xDZÔ{Eٛ §jˆ›EN€kÐ0 +h!YÓÊP3·ÉŸqG(kºi;P)ʖl8î +Ø:ÚQmlˆ–¹­JÔTÂî€1“³6²JjÙcR +ۯ늓Å. %d8Iä:ì”7ÁÙ× +¶@sü9!1“RÉÙeC+OªgMªÞŸÔQ +ÓB’i Iýb±Šõç5Û–-ã\ +M‰Ç}.†TËæT#gž+’Œ÷c4l`g6Á’¬jg­xŒ–Ï +Ñ +e[ӆb–z±p£9Àƒjg6AHFºiànxVÇõ+“G™­”ª#ŽñÒ®˜@™¢e«ŠÅ4ŽŠQÓ, +;±4H ‚i9ᢊ +ƒ „ -"ÒZ'å -JÍÃOŒ,ÔJAIÏF$H -˜CŠ²‡dGÁPCËiØ1•ûY‚ðØVTäŸF$ ÀÛP74‘¬ªyši§ ¿iG(«š LgeS։ƒzGLÀŠd{ŠžéEgÀˆËi:K9%‰ðˆi‡ú­kIє‚9€“8r&ù-pþ–  -x’ŸŽ™\㊒S«ºš·ž'4nœÈöo -ËiÝ0QØÐÑžýâc]Ö_PUÿžlêCs?$ýT÷Ð(*&ö+ú¶1Ž„e:ý‘`“&³VdE=o¥ãušyhèÇÈcuÄÖë1•‹׏6WœÜ¢Œ4C§ÝhTâä•ÜAÉ/Ö -ù]nÞ1ÆP2kbÅÐCԁêwõŒ!ÃÈô:Íò †2†I³ª*"B„~ºF@Àñƒ³ÚÝ®ü=§Î -®.npÉ -Ö±Áâ]GœhóƒšsM¹§Œð])œ˜)zöÁ{(✾] -NâUi—×òÂKùÔ'|ÄÇp4çÑøûá{Þ¹ð¯GCº›V–}ÑtE4w¬ðáXÄ÷0ê‘Ð -ˆŠ)Xöÿ¶DU÷ †ÅËÒû¯n -ËÚÝú>sþ[:®ÙÿÝ^Þ{ŸÿÏxœ^gÿ÷¹ÙþÿBx1ûÿO¿üÐùœý˜¯œ:žÃ -œ_y>¬‰^ýËïOE§,>/G)ŒÀÑö7žîÑÑÙ³ú.µ>>é>ý£[p.®|Cèðýã³'à.(|u¹œ;ô.§&žý;ýú[?öÓÿî›øXù\9Žýfr -ݧ -nÁ¹žN­Z­•ÊõÃÃfѶËõR§]Žª¥b»Ø²Ú -ë°T¬5:õF±TkÚ­Ž]ÈÙÿíèôìôQÉ79î끚ǭŸ(øhŒ|®šÏÑš(»\Ž¬b«}xPjV«õZµa7êµJŲJ•r»b[Tfë VªÖ+TߏÎN®Ñ$Ñu‡?ì×OšÊߟ³à”’Œp¥&ÚïhjØ -«ÒŽ«õN˲[Z³U/µ*õš]?,µ*öA£ZîXV¥n7;É:=îþùë“cg®žúrR ZþÅS\%c§ž7„{¢äâI`nÝ+ -ž‡©D@ÌMûB‰˜gÝéœEa-’^ú|7¢EgƒædFü8(íFdLOñɄ -ûŸâ -ƒÁ`0 -ƒÁ`0 -ƒÁ`0 -FŸ¿ès(( +># èÚ±‹z +§+nhÔÝÁåð&SN0ŸZIŒ8Œ«h8Û‹Zb<^~$J+³QÕ(î| +€šݎ‡ +ëvzYü‚ÖËü­ô¢w;ÁÖü§tŽ—|:}OºãŸ—ÒŽ^š_ŠâJÅto ,ÑR"ž÷‰( +€ £«|# +àr"Žzèˆ +Š¹÷_ÿþ”Ç–õ ./tmp_list_file + for ff in $TDIRS; do mkdir "${BASE}/${ff}" || { @@ -1149,9 +1152,12 @@ return 1; } + echo "${BASE}/${ff}" >> ./tmp_list_file chmod 0755 "${BASE}/${ff}" for gg in $TFILES; do echo "1 This is a test file" > "${BASE}/${ff}/${gg}" chmod 0644 "${BASE}/${ff}/${gg}" + echo "${BASE}/${ff}/${gg}" >> ./tmp_list_file ln -s "${BASE}/${ff}/${gg}" "${BASE}/${ff}/l_${gg}" + echo "${BASE}/${ff}/l_${gg}" >> ./tmp_list_file done echo "2 This is a test file" >> "${BASE}/${ff}/y" @@ -1207,5 +1213,5 @@ POLICY=`eval echo '"$'"TESTPOLICY_$tcount"'"'` - until [ -z "$POLICY" ] + until [ ${tcount} -gt ${MAXTEST_3} ] do prep_init Index: trunk/test/testrun_1a.sh =================================================================== --- trunk/test/testrun_1a.sh (revision 474) +++ trunk/test/testrun_1a.sh (revision 481) @@ -27,5 +27,5 @@ testrun_stealth () { - tcount=14 + tcount=1 if test -r "Makefile"; then Index: trunk/test/testrun_2a.sh =================================================================== --- trunk/test/testrun_2a.sh (revision 474) +++ trunk/test/testrun_2a.sh (revision 481) @@ -23,7 +23,7 @@ RCFILE="$PW_DIR/testrc_2"; export RCFILE -SERVER_BUILDOPTS="--quiet $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST} --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS - -CLIENT_BUILDOPTS="--quiet $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS +SERVER_BUILDOPTS="--quiet $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST} --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --enable-debug=gdb"; export SERVER_BUILDOPTS + +CLIENT_BUILDOPTS="--quiet $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck --enable-debug"; export CLIENT_BUILDOPTS do_test_1_a () { @@ -233,5 +233,5 @@ } -MAXTEST=6; export MAXTEST +MAXTEST=4; export MAXTEST testrun2a () @@ -280,35 +280,13 @@ fi # - SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --enable-encrypt=1"; export SERVER_BUILDOPTS - CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS + SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-ipv6"; export SERVER_BUILDOPTS + CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-ipv6"; export CLIENT_BUILDOPTS # testrun2a_internal do_test_1_a if [ $? -eq 0 ]; then - [ -z "$quiet" ] && log_ok 4 ${MAXTEST} "Encryption (v1)"; + [ -z "$quiet" ] && log_ok 4 ${MAXTEST} "IPv6 disabled"; else - [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Encryption (v1)"; - fi - # - SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG}"; export SERVER_BUILDOPTS - CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS - # - testrun2a_internal - do_test_1_a - if [ $? -eq 0 ]; then - [ -z "$quiet" ] && log_ok 5 ${MAXTEST} "Encryption backward compat"; - else - [ -z "$quiet" ] && log_fail 5 ${MAXTEST} "Encryption backward compat"; - fi - # - SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-ipv6"; export SERVER_BUILDOPTS - CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-ipv6"; export CLIENT_BUILDOPTS - # - testrun2a_internal - do_test_1_a - if [ $? -eq 0 ]; then - [ -z "$quiet" ] && log_ok 6 ${MAXTEST} "IPv6 disabled"; - else - [ -z "$quiet" ] && log_fail 6 ${MAXTEST} "IPv6 disabled"; + [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "IPv6 disabled"; fi # Index: trunk/test/testrun_2d.sh =================================================================== --- trunk/test/testrun_2d.sh (revision 474) +++ trunk/test/testrun_2d.sh (revision 481) @@ -101,4 +101,13 @@ testrun2a_internal # + for ff in ./rc.*; do + ORIGINAL="SetUdpActive=no" + REPLACEMENT="ReportCheckflags=yes" + ex -s rc.morrigan.localdomain <