Commit cf6380c5 authored by Yoni Fogel's avatar Yoni Fogel

Addresses #1531 [11749] fixed some XFAILS in src/test (for windows). Marking...

Addresses #1531 [11749] fixed some XFAILS in src/test (for windows).  Marking those tests as expected to pass instead of expected to fail
Needed to point to the right binaries as well.

git-svn-id: file:///svn/toku/tokudb@11754 c7de825b-a66e-492c-adef-691d508d4ae1
parent 09f13fb8
...@@ -127,14 +127,9 @@ ifeq ($(OS_CHOICE),windows) ...@@ -127,14 +127,9 @@ ifeq ($(OS_CHOICE),windows)
test-recover3 \ test-recover3 \
#\ ends prev line #\ ends prev line
TDB_TESTS_THAT_SHOULD_FAIL_LIT += \ TDB_TESTS_THAT_SHOULD_FAIL_LIT += \
test_log2.recover \
test_log3.recover \
test_log4.recover \ test_log4.recover \
test_log5.recover \ test_log5.recover \
test_log6.recover \
test_log7.recover \ test_log7.recover \
test_log8.recover \
test_log9.recover \
test_log10.recover \ test_log10.recover \
#\ ends prev line #\ ends prev line
endif endif
...@@ -234,8 +229,14 @@ endif ...@@ -234,8 +229,14 @@ endif
%.tdbrun: %.tdb$(BINSUF) $(DEPEND_COMPILE) $(DEPEND_LINK) $(notdir $(LIBTDB)) %.tdbrun: %.tdb$(BINSUF) $(DEPEND_COMPILE) $(DEPEND_LINK) $(notdir $(LIBTDB))
$(TDBVGRIND) ./$< $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD) $(TDBVGRIND) ./$< $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
TDBDUMP=$(TOKUROOT)utils/tokudb_dump_static$(BINSUF) ifeq ($(OS_CHOICE),windows)
TDBLOAD=$(TOKUROOT)utils/tokudb_load_static$(BINSUF) TDBDUMP=$(TOKUROOT)utils/tokudb_dump$(BINSUF)
TDBLOAD=$(TOKUROOT)utils/tokudb_load$(BINSUF)
else
TDBDUMP=$(TOKUROOT)utils/tokudb_dump_static$(BINSUF)
TDBLOAD=$(TOKUROOT)utils/tokudb_load_static$(BINSUF)
endif
%.recover: %.tdb$(BINSUF) %.recover: %.tdb$(BINSUF)
echo doing ./$< &&\ echo doing ./$< &&\
......
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