summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Steinert <mike.steinert@gmail.com>2012-05-15 17:09:27 -0600
committerMichael Steinert <mike.steinert@gmail.com>2012-05-17 11:44:44 -0600
commitfa9bf464a111549da2d6c7b51fc7eee321ebdc4c (patch)
treea498bbf9459b74fb8c38d3077cfc983a9a7ab484 /tests
parentb742300edabe34beb505139a818a000ef7767a91 (diff)
downloadrabbitmq-c-github-ask-fa9bf464a111549da2d6c7b51fc7eee321ebdc4c.tar.gz
Convert to non-recursive Automake
This change should speed up parallel builds considerably. It also simplifies the structure of the build system making it possible to properly track dependencies. Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am18
-rw-r--r--tests/test_tables.c2
2 files changed, 1 insertions, 19 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index ac694dc..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-check_PROGRAMS = test_tables test_parse_url
-TESTS = $(check_PROGRAMS)
-EXTRA_DIST = test_tables.expected
-
-AM_CFLAGS = -I$(top_srcdir)/librabbitmq
-
-if GCC
-# Because we want to build under Microsoft's C compiler (for which
-# there is apparently no demand for C99 support), it's a good idea
-# to have gcc tell us when we stray from the old standard.
-AM_CFLAGS += -ansi -pedantic
-endif
-
-if USE_MSINTTYPES
-AM_CFLAGS += -I$(top_srcdir)/msinttypes
-endif
-
-AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
diff --git a/tests/test_tables.c b/tests/test_tables.c
index 363b9f4..a01a9b0 100644
--- a/tests/test_tables.c
+++ b/tests/test_tables.c
@@ -438,7 +438,7 @@ static int compare_files(const char *f1, const char *f2)
return res;
}
-const char *expected_file_name = "test_tables.expected";
+const char *expected_file_name = "tests/test_tables.expected";
int main(int argc, char **argv)
{