Permalink
Browse files

fix makefile and runtests.sh to match test directive in scons

  • Loading branch information...
1 parent 3882760 commit 7dd12313c3ba73e4189386b681c9eccc310ecfc0 @zhemao zhemao committed Jun 27, 2012
Showing with 9 additions and 9 deletions.
  1. +8 −8 Makefile
  2. +1 −1 runtests.sh
View
16 Makefile
@@ -30,17 +30,17 @@ BSON_LIBNAME=libbson
ENV?=posix
# TODO: add replica set test, cpp test, platform tests, json_test
-TESTS=test/auth_test test/bson_test test/bson_subobject_test test/count_delete_test \
- test/cursors_test test/endian_swap_test test/errors_test test/examples_test \
- test/functions_test test/gridfs_test test/helpers_test \
- test/oid_test test/resize_test test/simple_test test/sizes_test test/update_test \
- test/validate_test test/write_concern_test test/commands_test
+TESTS=test_auth test_bson test_bson_subobject test_count_delete \
+ test_cursors test_endian_swap test_errors test_examples \
+ test_functions test_gridfs test_helpers \
+ test_oid test_resize test_simple test_sizes test_update \
+ test_validate test_write_concern test_commands
MONGO_OBJECTS=src/bson.o src/encoding.o src/gridfs.o src/md5.o src/mongo.o \
src/numbers.o
BSON_OBJECTS=src/bson.o src/numbers.o src/encoding.o
ifeq ($(ENV),posix)
- TESTS+=test/env_posix_test
+ TESTS+=test_env_posix
MONGO_OBJECTS+=src/env_posix.o
else
MONGO_OBJECTS+=src/env_standard.o
@@ -179,15 +179,15 @@ docs:
python docs/buildscripts/docs.py
clean:
- rm -rf $(MONGO_DYLIBNAME) $(MONGO_STLIBNAME) $(BSON_DYLIBNAME) $(BSON_STLIBNAME) src/*.o src/*.os test/*_test
+ rm -rf $(MONGO_DYLIBNAME) $(MONGO_STLIBNAME) $(BSON_DYLIBNAME) $(BSON_STLIBNAME) src/*.o src/*.os test_*
deps:
$(CC) -MM -DMONGO_HAVE_STDINT src/*.c
32bit:
$(MAKE) CFLAGS="-m32" LDFLAGS="-pg"
-%_test: %_test.c $(MONGO_STLIBNAME)
+test_%: test/%_test.c $(MONGO_STLIBNAME)
$(CC) -o $@ -L. -Isrc $(TEST_DEFINES) $(ALL_LDFLAGS) $< $(MONGO_STLIBNAME)
%.o: %.c
View
2 runtests.sh
@@ -27,7 +27,7 @@ do
esac
done
-for i in `find . -name *_test`
+for i in `find . -name test_\*`
do
if [ $valgrind -eq 1 ]
then

0 comments on commit 7dd1231

Please sign in to comment.