Created
September 13, 2010 10:31
-
-
Save tfheen/577107 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: bin/varnishtest/tests/m00001.vtc | |
=================================================================== | |
--- bin/varnishtest/tests/m00001.vtc (revisjon 5193) | |
+++ bin/varnishtest/tests/m00001.vtc (arbeidskopi) | |
@@ -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); | |
Index: bin/varnishtest/Makefile.am | |
=================================================================== | |
--- bin/varnishtest/Makefile.am (revisjon 5193) | |
+++ bin/varnishtest/Makefile.am (arbeidskopi) | |
@@ -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 | |
Index: bin/varnishtest/vtc.c | |
=================================================================== | |
--- bin/varnishtest/vtc.c (revisjon 5193) | |
+++ bin/varnishtest/vtc.c (arbeidskopi) | |
@@ -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)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment