From 345efd8f66b34e64ad3eb395513aeafcdd64d15e Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Wed, 16 Feb 2022 15:57:02 +0100
Subject: [PATCH] [tests] compliance: ensure compatibility with dune
---
tests/compliance/check-json.i | 2 +-
tests/compliance/oracle/json_check-json_5.txt | 4 ++--
tests/compliance/sanity-checks.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/compliance/check-json.i b/tests/compliance/check-json.i
index 99a889344ab..c9e5ac23e74 100644
--- a/tests/compliance/check-json.i
+++ b/tests/compliance/check-json.i
@@ -1,5 +1,5 @@
/*run.config
- MACRO: SHARE @PTEST_SHARE_DIR@/compliance
+ MACRO: SHARE @FRAMAC_SHARE@/compliance
NOFRAMAC:
EXECNOW: LOG json_@PTEST_NAME@_1.txt python3 -m json.tool < @SHARE@/c11_functions.json | head -n 2 > @PTEST_RESULT@/json_@PTEST_NAME@_1.txt 2> @DEV_NULL@
EXECNOW: LOG json_@PTEST_NAME@_2.txt python3 -m json.tool < @SHARE@/glibc_functions.json | head -n 2 > @PTEST_RESULT@/json_@PTEST_NAME@_2.txt 2> @DEV_NULL@
diff --git a/tests/compliance/oracle/json_check-json_5.txt b/tests/compliance/oracle/json_check-json_5.txt
index 7a7ac78c07c..295b7a131d2 100644
--- a/tests/compliance/oracle/json_check-json_5.txt
+++ b/tests/compliance/oracle/json_check-json_5.txt
@@ -1,2 +1,2 @@
-../../../share/compliance/posix_identifiers.json checked.
-../../../share/compliance/c11_functions.json checked.
+posix_identifiers.json checked.
+c11_functions.json checked.
diff --git a/tests/compliance/sanity-checks.py b/tests/compliance/sanity-checks.py
index 3a7418b6414..0256ff02d02 100755
--- a/tests/compliance/sanity-checks.py
+++ b/tests/compliance/sanity-checks.py
@@ -36,7 +36,7 @@ with open(posix_ids_path) as data:
unknown_exts = exts - extension_names
if unknown_exts:
sys.exit(f"error: unknown extension(s) {unknown_exts} for id {i}")
-print(f"{posix_ids_path} checked.")
+print(f"{posix_ids_path.name} checked.")
c11_headers_path = Path(compliance_dir) / "c11_headers.json"
c11_headers = []
@@ -71,4 +71,4 @@ for (i, v) in c11_funs.items():
posix_header = posix_dict[i]["header"]
if header != posix_header:
sys.exit(f"error: C11 function {i} mapped to header {header}, but in POSIX it is mapped to header {posix_header}")
-print(f"{c11_funs_path} checked.")
+print(f"{c11_funs_path.name} checked.")
--
GitLab