Author: kpvdr
Date: 2007-09-30 10:33:44 -0400 (Sun, 30 Sep 2007)
New Revision: 954
Modified:
store/trunk/cpp/tests/jrnl/Makefile.rtest
store/trunk/cpp/tests/jrnl/janalyze.py
store/trunk/cpp/tests/jrnl/rtest
Log:
Minor bugfixes in tools/scripts
Modified: store/trunk/cpp/tests/jrnl/Makefile.rtest
===================================================================
--- store/trunk/cpp/tests/jrnl/Makefile.rtest 2007-09-28 20:56:24 UTC (rev 953)
+++ store/trunk/cpp/tests/jrnl/Makefile.rtest 2007-09-30 14:33:44 UTC (rev 954)
@@ -41,7 +41,7 @@
SHELL = /bin/bash
-QPID_HOME_DIR = $(HOME)/rhm/qpid
+QPID_HOME_DIR = $(HOME)/qpid
RHM_JRNL_SRC_DIR = ../../lib/jrnl
RHM_JRNL_DOC_DIR = ../../docs
Modified: store/trunk/cpp/tests/jrnl/janalyze.py
===================================================================
--- store/trunk/cpp/tests/jrnl/janalyze.py 2007-09-28 20:56:24 UTC (rev 953)
+++ store/trunk/cpp/tests/jrnl/janalyze.py 2007-09-30 14:33:44 UTC (rev 954)
@@ -373,8 +373,15 @@
def run(self):
- start_info = self.analyze_files()
- stop = self.advance_file(*start_info)
+ try:
+ start_info = self.analyze_files()
+ stop = self.advance_file(*start_info)
+ except Exception:
+ print 'WARNING: All journal files are empty.'
+ if self.num_msgs > 0:
+ raise Exception('All journal files are empty.')
+ else:
+ stop = True
while not stop:
warn = ''
if file_full(self.f):
@@ -528,7 +535,7 @@
print 'Usage: ftest test-file test-number'
raise Exception('Illegal argument value')
-if len(sys.argv) != 0:
+if len(sys.argv) == 1:
m = Main(None, None)
m.run()
else:
Modified: store/trunk/cpp/tests/jrnl/rtest
===================================================================
--- store/trunk/cpp/tests/jrnl/rtest 2007-09-28 20:56:24 UTC (rev 953)
+++ store/trunk/cpp/tests/jrnl/rtest 2007-09-30 14:33:44 UTC (rev 954)
@@ -30,6 +30,7 @@
NUM_JFILES=8
VG_NORM_FILESIZE=11
+#VG_NORM_FILESIZE=18 # RHEL5 triggers extra valgrind messages when pthreads are in use
# Write test
W_DO_TEST=T
@@ -367,7 +368,7 @@
fi
lc=`wc -l < ${TEMP_V_FILE}`
if (( ${lc} != ${VG_NORM_FILESIZE} )); then
- echo "${VALGRIND} ${TEST_PROG} -t ${test_num} exposed errors;
exiting."
+ echo "${VALGRIND} ${TEST_PROG} ${test_file} ${test_num} exposed errors;
exiting."
echo
cat ${TEMP_V_FILE}
return 5
Show replies by date