mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove spurious cxx test output. Fixes #1675.

Browse source 
git-svn-id: file:///svn/toku/tokudb@11230 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:48 -04:00 • committed by Yoni Fogel
parent 17e5214663
commit 0982c11fbf
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cxx/tests/Makefile
View file

@ -115,24 +115,24 @@ check_a_bunch:
$(VGRIND) ./test_get_not_found $(SUMMARIZE_CMD) $(VGRIND) ./test_get_not_found $(SUMMARIZE_CMD)
check_db_create: db_create check_db_create: db_create
rm -f $@.tdb rm -rf $@.tdb
$(VGRIND) ./db_create -s main $@.tdb $(SUMMARIZE_CMD) $(VGRIND) ./db_create -s main $@.tdb $(SUMMARIZE_CMD)
check_db_create_DSM: db_create check_db_create_DSM: db_create
rm -f $@.tdb rm -rf $@.tdb
$(VGRIND) ./db_create -D -S -s main $@.tdb $(SUMMARIZE_CMD) $(VGRIND) ./db_create -D -S -s main $@.tdb $(SUMMARIZE_CMD)
check_db_create_1: check_db_create_1: db_create
$(VGRIND) ./db_create > $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD) $(VGRIND) ./db_create &> $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD)
check_db_create_2: check_db_create_2: db_create
$(VGRIND) ./db_create -h 2> $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD) $(VGRIND) ./db_create -h &> $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD)
check_db_create_3: check_db_create_3: db_create
$(VGRIND) ./db_create --help 2> $@.out; test $$? -ne 0 $(SUMMARIZE_CMD) $(VGRIND) ./db_create --help &> $@.out; test $$? -ne 0 $(SUMMARIZE_CMD)
check_db_create_4: check_db_create_4: db_create
$(VGRIND) ./db_create -s 2> $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD) $(VGRIND) ./db_create -s &> $@.out ; test $$? -ne 0 $(SUMMARIZE_CMD)
check_permissions: check_permissions:
rm -f permissions.tdb rm -f permissions.tdb
./db_create permissions.tdb 1 1 && \ ./db_create permissions.tdb 1 1 && \
chmod -w permissions.tdb && \ chmod -w permissions.tdb && \
(./db_create permissions.tdb 2 2 2> check_permissions.out; test $$? -ne 0) \ (./db_create permissions.tdb 2 2 &> check_permissions.out; test $$? -ne 0) \
$(SUMMARIZE_CMD) $(SUMMARIZE_CMD)

4
cxx/tests/db_create.cpp
View file

@ -44,8 +44,8 @@ static int dbcreate(char *dbfile, char *dbname, int dbflags, int argc, char *arg
} }
static int usage() { static int usage() {
printf("db_create [-s DBNAME] [-D] [-S] DBFILE [KEY VAL]*\n"); fprintf(stderr, "db_create [-s DBNAME] [-D] [-S] DBFILE [KEY VAL]*\n");
printf("[--set_data_dir DIRNAME]\n"); fprintf(stderr, "[--set_data_dir DIRNAME]\n");
return 1; return 1;
} }