]> git.puffer.fish Git - mirror/frr.git/commitdiff
tests: fix clippy include paths / double-build 982/head
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 15 Aug 2017 09:17:36 +0000 (11:17 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 15 Aug 2017 09:21:07 +0000 (11:21 +0200)
A mismatch between the make rule and the include path causes dependency
tracking to try to build the clippy.c file twice (at the same time),
which results in spurious build failures.

Fixes: #971
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
tests/lib/cli/test_cli.c
tests/ospf6d/test_lsdb.c

index 8f062d8b5efdf916f3ae90160641bfc692f165d3..4cc15ba23fd8db5e466948071abdfe79c3108771 100644 (file)
@@ -41,7 +41,7 @@ DUMMY_DEFUN(cmd13, "alt a X:X::X:X");
 DUMMY_DEFUN(cmd14,
            "pat g {  foo A.B.C.D$foo|foo|bar   X:X::X:X$bar| baz } [final]");
 
-#include "tests/lib/cli/test_cli_clippy.c"
+#include "lib/cli/test_cli_clippy.c"
 
 DEFPY(magic_test, magic_test_cmd,
        "magic (0-100) {ipv4net A.B.C.D/M|X:X::X:X$ipv6}",
index 310c4a7323a82a218c6b5e9fc05e6455dec801e6..633e88e76980952b0a1bee22dade471bbe1ef170 100644 (file)
@@ -29,7 +29,7 @@
 #include "ospf6d/ospf6_lsdb.h"
 
 #include "tests/lib/cli/common_cli.h"
-#include "tests/ospf6d/test_lsdb_clippy.c"
+#include "ospf6d/test_lsdb_clippy.c"
 
 static struct ospf6_lsdb *lsdb;