Commit 9b620f86 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland

Apply extmacros first

parent cab6b85b
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment