[ccan] [PATCH v2 04/13] configurator: Use native directory separator
Kevin Locke
kevin at kevinlocke.name
Fri Sep 23 13:33:07 AEST 2016
Although Windows APIs generally permit "/" or "\\" for directory
separators in paths, cmd.exe does not recognize "./" when invoking
executables using a relative path and prints the following error:
'.' is not recognized as an internal or external command,
operable program or batch file.
Therefore, use "\\" when invoking tests on Windows.
Signed-off-by: Kevin Locke <kevin at kevinlocke.name>
Reviewed-by: David Gibson <david at gibson.dropbear.id.au>
---
tools/configurator/configurator.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 5929355..7c4dd4a 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -44,6 +44,12 @@
#define OUTPUT_FILE "configurator.out"
#define INPUT_FILE "configuratortest.c"
+#ifdef _WIN32
+#define DIR_SEP "\\"
+#else
+#define DIR_SEP "/"
+#endif
+
static const char *progname = "";
static int verbose;
@@ -632,7 +638,7 @@ static bool run_test(const char *cmd, struct test *test)
free(output);
/* We run INSIDE_MAIN tests for sanity checking. */
if ((test->style & EXECUTE) || (test->style & INSIDE_MAIN)) {
- output = run("./" OUTPUT_FILE, &status);
+ output = run("." DIR_SEP OUTPUT_FILE, &status);
if (!(test->style & EXECUTE) && status != 0)
errx(1, "Test for %s failed with %i:\n%s",
test->name, status, output);
--
2.9.3
More information about the ccan
mailing list