r5196 - in trunk/varnish-cache/bin/varnishtest: . tests

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-09-13 12:34:59 +0200 (Mon, 13 Sep 2010)
New Revision: 5196

Modified:
   trunk/varnish-cache/bin/varnishtest/Makefile.am
   trunk/varnish-cache/bin/varnishtest/tests/m00001.vtc
   trunk/varnish-cache/bin/varnishtest/vtc.c
Log:
Rename topsrc to topbuild and fix VPATH builds

We want to access files in the build directory, not the source
directory.


Modified: trunk/varnish-cache/bin/varnishtest/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-09-13 10:00:41 UTC (rev 5195)
+++ trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-09-13 10:34:59 UTC (rev 5196)
@@ -30,7 +30,7 @@
 		${LIBM} ${PTHREAD_LIBS}
 
 varnishtest_CFLAGS = \
-		-DTOP_SRCDIR='"${top_srcdir}"'
+		-DTOP_BUILDDIR='"${top_builddir}"'
 
 EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \
 	$(top_srcdir)/bin/varnishtest/tests/README

Modified: trunk/varnish-cache/bin/varnishtest/tests/m00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/m00001.vtc	2010-09-13 10:00:41 UTC (rev 5195)
+++ trunk/varnish-cache/bin/varnishtest/tests/m00001.vtc	2010-09-13 10:34:59 UTC (rev 5196)
@@ -8,7 +8,7 @@
 } -start
 
 varnish v1 -vcl+backend {
-	import std from "${topsrc}/lib/libvmod_std/.libs/libvmod_std.so.1" ;
+	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so.1" ;
 
 	sub vcl_deliver {
 		set resp.http.foo = std.toupper(resp.http.foo);

Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2010-09-13 10:00:41 UTC (rev 5195)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2010-09-13 10:34:59 UTC (rev 5196)
@@ -618,7 +618,7 @@
 	const char *nmax;
 	char cmd[BUFSIZ];
 	char *cwd;
-	char topsrc[BUFSIZ];
+	char topbuild[BUFSIZ];
 
 	setbuf(stdout, NULL);
 	setbuf(stderr, NULL);
@@ -658,8 +658,8 @@
 	macro_def(vltop, NULL, "tmpdir", vtc_tmpdir);
 
 	cwd = getcwd(NULL, 0);
-	bprintf(topsrc, "%s/%s", cwd, TOP_SRCDIR);
-	macro_def(vltop, NULL, "topsrc", topsrc);
+	bprintf(topbuild, "%s/%s", cwd, TOP_BUILDDIR);
+	macro_def(vltop, NULL, "topbuild", topbuild);
 
 	AZ(pthread_mutex_init(&vtc_mtx, NULL));
 	AZ(pthread_cond_init(&vtc_cond, NULL));