[master] 9b620f8 Apply extmacros first

[Martin Blix Grydeland]

commit 9b620f86618318e48423b1e40afc5015d28746de
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Mar 21 12:01:27 2011 +0100

    Apply extmacros first

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 909e588..1cc16cf 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -490,6 +490,10 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
 	init_macro();
 	init_sema();
 
+	/* Apply extmacro definitions */
+	VTAILQ_FOREACH(m, &extmacro_list, list)
+		macro_def(vltop, NULL, m->name, m->val);
+
 	/* We are still in bin/varnishtest at this point */
 	cwd = getcwd(NULL, PATH_MAX);
 	bprintf(topbuild, "%s/%s", cwd, TOP_BUILDDIR);
@@ -504,10 +508,6 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
 	AZ(chdir(tmpdir));
 	macro_def(vltop, NULL, "tmpdir", tmpdir);
 
-	/* Apply extmacro definitions */
-	VTAILQ_FOREACH(m, &extmacro_list, list)
-		macro_def(vltop, NULL, m->name, m->val);
-
 	/* Drop file to tell what was going on here */
 	f = fopen("INFO", "w");
 	AN(f);