tests: various distcheck work.

Author: chergert

tests/Makefile.am

@@ -14,6 +14,7 @@ TEST_PROGS = test-libmongoc
 
 TEST_CFLAGS = \
 	-DMONGOC_COMPILATION \
+	-DBINARY_DIR="\"$(srcdir)/tests/binary\"" \
 	$(BSON_CFLAGS) \
 	-I$(top_srcdir)/src/mongoc \
 	-I$(top_builddir)/src/mongoc
@@ -102,20 +103,19 @@ test_sharded_cluster_SOURCES = \
 test_sharded_cluster_CFLAGS = $(TEST_CFLAGS)
 test_sharded_cluster_LDADD = $(TEST_LIBS)
 
-test_certs: $(top_builddir)/tests/trust_dir/done
+test_certs: tests/trust_dir/done
 
 tests/trust_dir/done: $(top_srcdir)/tests/make_ca.pl $(top_srcdir)/tests/trust_dir.cnf
-	$< $(top_srcdir)/tests/trust_dir $(top_srcdir)/tests/trust_dir.cnf
-	touch $(top_srcdir)/tests/trust_dir/done
+	$< $(top_builddir)/tests/trust_dir $(top_srcdir)/tests/trust_dir.cnf
+	touch $(top_builddir)/tests/trust_dir/done
 
-if WITH_LIBBSON
 libbson_check:
+if WITH_LIBBSON
 	@ $(MAKE) -C src/libbson check
-check: libbson_check test
-else
-check: test
 endif
 
+check: libbson_check test abicheck
+
 TEST_ARGS = -f -p
 
 if ENABLE_SSL
@@ -126,8 +126,12 @@ endif
 	@ for TEST_PROG in $(TEST_PROGS) ; do \
 		./$$TEST_PROG $(TEST_ARGS) -F test.log; \
 	done
+
 if OS_LINUX
+abicheck:
 	@ $(srcdir)/tests/abicheck.sh "$(srcdir)/src/libmongoc.symbols"
+else
+abicheck:
 endif
 
 DISTCLEANFILES += test.log
@@ -146,7 +150,10 @@ EXTRA_DIST += \
 	tests/binary/reply1.dat \
 	tests/binary/reply2.dat \
 	tests/binary/update1.dat \
+	tests/certificates/ca.pem \
+	tests/certificates/client.pem \
 	tests/mock-server.c \
 	tests/mock-server.h \
 	tests/mongoc-tests.c \
-	tests/mongoc-tests.h
+	tests/mongoc-tests.h \
+	tests/trust_dir.cnf

tests/test-mongoc-buffer.c

@@ -14,7 +14,7 @@ test_mongoc_buffer_basic (void)
    uint8_t *data = bson_malloc0(1024);
    ssize_t r;
 
-   stream = mongoc_stream_file_new_for_path ("tests/binary/reply1.dat", O_RDONLY, 0);
+   stream = mongoc_stream_file_new_for_path (BINARY_DIR"/reply1.dat", O_RDONLY, 0);
    ASSERT(stream);
 
    _mongoc_buffer_init(&buf, data, 1024, bson_realloc);

tests/test-mongoc-gridfs.c

@@ -154,7 +154,7 @@ test_create_from_stream (void)
 
    mongoc_gridfs_drop (gridfs, &error);
 
-   stream = mongoc_stream_file_new_for_path ("tests/binary/gridfs.dat", O_RDONLY, 0);
+   stream = mongoc_stream_file_new_for_path (BINARY_DIR"/gridfs.dat", O_RDONLY, 0);
    assert (stream);
 
    file = mongoc_gridfs_create_file_from_stream (gridfs, stream, NULL);
@@ -196,7 +196,7 @@ test_read (void)
 
    mongoc_gridfs_drop (gridfs, &error);
 
-   stream = mongoc_stream_file_new_for_path ("tests/binary/gridfs.dat", O_RDONLY, 0);
+   stream = mongoc_stream_file_new_for_path (BINARY_DIR"/gridfs.dat", O_RDONLY, 0);
 
    file = mongoc_gridfs_create_file_from_stream (gridfs, stream, NULL);
    assert (file);
@@ -301,7 +301,7 @@ test_stream (void)
 
    mongoc_gridfs_drop (gridfs, &error);
 
-   in_stream = mongoc_stream_file_new_for_path ("tests/binary/gridfs.dat", O_RDONLY, 0);
+   in_stream = mongoc_stream_file_new_for_path (BINARY_DIR"/gridfs.dat", O_RDONLY, 0);
 
    file = mongoc_gridfs_create_file_from_stream (gridfs, in_stream, NULL);
    assert (file);

tests/test-mongoc-rpc.c

@@ -19,7 +19,7 @@ get_test_file (const char *filename,
    int fd;
 
    bson_snprintf (real_filename, sizeof real_filename,
-                  "tests/binary/%s", filename);
+                  BINARY_DIR"/%s", filename);
 
 #ifdef _WIN32
    fd = _open (real_filename, O_RDONLY | _O_BINARY);

tests/test-mongoc-stream.c

@@ -16,7 +16,7 @@ test_buffered_basic (void)
    ssize_t r;
    char buf[16236];
 
-   stream = mongoc_stream_file_new_for_path ("tests/binary/reply2.dat", O_RDONLY, 0);
+   stream = mongoc_stream_file_new_for_path (BINARY_DIR"/reply2.dat", O_RDONLY, 0);
    assert (stream);
 
    /* buffered assumes ownership of stream */
@@ -42,7 +42,7 @@ test_buffered_oversized (void)
    ssize_t r;
    char buf[16236];
 
-   stream = mongoc_stream_file_new_for_path ("tests/binary/reply2.dat", O_RDONLY, 0);
+   stream = mongoc_stream_file_new_for_path (BINARY_DIR"/reply2.dat", O_RDONLY, 0);
    assert (stream);
 
    /* buffered assumes ownership of stream */