Commit 37cbcf40 authored by Yoni Fogel's avatar Yoni Fogel

Addresses #1531 Removed -w option as a workaround for diffs

Windows utils/dump/etc will need to output the correct dos/unix endline format


git-svn-id: file:///svn/toku/tokudb@10495 c7de825b-a66e-492c-adef-691d508d4ae1
parent ba14ff5d
......@@ -205,7 +205,7 @@ endif
echo dump and compare &&\
../../utils/tokudb_dump -h dir.$*.c.tdb foo.db > dir.$*.c.tdb/foo.dump && \
../../utils/tokudb_dump -h dir.$*.c.tdb.recover foo.db > dir.$*.c.tdb.recover/foo.dump && \
diff dir.$*.c.tdb/foo.dump dir.$*.c.tdb.recover/foo.dump \
diff -q dir.$*.c.tdb/foo.dump dir.$*.c.tdb.recover/foo.dump \
$(MAYBEINVERTER) $(SUMMARIZE_CMD)
%.recoverwc: %.tdb$(BINSUF)
......@@ -361,7 +361,7 @@ test1426.tdbrun: test1426.tdb$(BINSUF) test1426.bdb$(BINSUF)
./test1426.bdb -q && \
$(BDBDIR)/bin/db_dump -p -h dir.test1426.c.bdb main > dump.bdb.1426 && \
../../utils/tokudb_dump$(BINSUF) -p -h dir.test1426.c.tdb main > dump.tdb.1426 && \
diff -I db_pagesize=4096 dump.bdb.1426 dump.tdb.1426 ) \
diff -q -I db_pagesize=4096 dump.bdb.1426 dump.tdb.1426 ) \
$(MAYBEINVERTER) $(SUMMARIZE_CMD)
# helgrind1 is supposed to fail.
......@@ -373,7 +373,7 @@ helgrind3.tdbrun: TDBVGRIND=$(HGRIND)
helgrind3.bdbrun: BDBVGRIND=$(HGRIND)
dumpit:
../../newbrt/brtdump dir.test_log5.c.tdb.recover/foo.db > dump.r && ../../newbrt/brtdump dir.test_log5.c.tdb/foo.db > dump.o && diff dump.o dump.r
../../newbrt/brtdump dir.test_log5.c.tdb.recover/foo.db > dump.r && ../../newbrt/brtdump dir.test_log5.c.tdb/foo.db > dump.o && diff -q dump.o dump.r
# test on small stacks
test_thread_stack.%run: test_thread_stack.%$(BINSUF)
......
......@@ -17,7 +17,7 @@ endif
BDB_DUMP=$(BDBDIR)/bin/db_dump$(BINSUF)
BDB_LOAD=$(BDBDIR)/bin/db_load$(BINSUF)
DIFF=diff -w -I 'db_pagesize='
DIFF=diff -q -I 'db_pagesize='
# vars to compile bins that handle tokudb using libdb.so
# when one uses relative address in an rpath, the library better be located relative
......
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