From 17adf58d5dc5d8253f2322e92b96bd176476b6f3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 23 Apr 2019 11:33:47 +0200 Subject: [PATCH] tools: fix out-of-tree build test "tools/check-docs.sh" for duplicate generated sources When we do an in-tree-build with autotools and an out-of-tree build with meson (all in the same source directory), then we have the following files: libnm-core/nm-core-enum-types.h libnm/nm-enum-types.h build/libnm-core/nm-core-enum-types.h build/libnm/nm-enum-types.h This caused "tools/check-docs.sh" for `ninja -C build test` to fail, because the files are detected twice: --- command --- /data/src/NetworkManager/tools/check-docs.sh /data/src/NetworkManager /data/src/NetworkManager/build --- stderr --- 8a9 > nm-core-enum-types 38a40 > nm-enum-types *** Error: libnm classes not included in docs/libnm/libnm-docs.xml *** ------- --- tools/check-docs.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/check-docs.sh b/tools/check-docs.sh index 04f03e76d..e0ed78376 100755 --- a/tools/check-docs.sh +++ b/tools/check-docs.sh @@ -23,7 +23,13 @@ same_lines() { libnm_headers() { ( - ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h + ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h | \ + if [ -n "$2" ]; then + grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \ + grep -v -F "$1/libnm/nm-enum-types.h" + else + cat + fi if [ -n "$2" ]; then ls -1 "$2/libnm"/*.h "$2/libnm-core"/*.h fi