Commit ef870a9e authored by Yoni Fogel's avatar Yoni Fogel

[t:2679] Fix log test failures due to changed log file name

git-svn-id: file:///svn/toku/tokudb@20840 c7de825b-a66e-492c-adef-691d508d4ae1
parent 1c2d29dc
...@@ -371,7 +371,7 @@ $(TDBBRTDUMP) $(TDBLOAD) $(TDBDUMP) $(TDBRECOVER): ...@@ -371,7 +371,7 @@ $(TDBBRTDUMP) $(TDBLOAD) $(TDBDUMP) $(TDBRECOVER):
cp dir.$*.c.tdb/tokudb.directory dir.$*.c.tdb.recover/ && \ cp dir.$*.c.tdb/tokudb.directory dir.$*.c.tdb.recover/ && \
cp dir.$*.c.tdb/tokudb.environment dir.$*.c.tdb.recover/ && \ cp dir.$*.c.tdb/tokudb.environment dir.$*.c.tdb.recover/ && \
cp dir.$*.c.tdb/tokudb.rollback dir.$*.c.tdb.recover/ && \ cp dir.$*.c.tdb/tokudb.rollback dir.$*.c.tdb.recover/ && \
cp dir.$*.c.tdb/*.tokulog dir.$*.c.tdb.recover/ && \ cp dir.$*.c.tdb/*.tokulog* dir.$*.c.tdb.recover/ && \
echo doing recovery &&\ echo doing recovery &&\
$(VGRIND) $(TDBRECOVER) dir.$*.c.tdb.recover dir.$*.c.tdb.recover && \ $(VGRIND) $(TDBRECOVER) dir.$*.c.tdb.recover dir.$*.c.tdb.recover && \
echo dump and compare &&\ echo dump and compare &&\
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
static int static int
grep_for_in_logs (const char *str) { grep_for_in_logs (const char *str) {
#ifdef TOKUDB #ifdef TOKUDB
#define lname ENVDIR "/log000000000000.tokulog" #define lname ENVDIR "/log000000000000.tokulog[0-9]*"
#else #else
#define lname ENVDIR "/log.0000000001" #define lname ENVDIR "/log.0000000001"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment