Use libclang include path in tests

.github/workflows/makefile.yml

@@ -35,8 +35,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-      - name: Install dependencies (apt)
-        run: sudo apt-get install -y python3-clang python3-pip
       - name: Examples check
         run: |
           . venv

docker/Dockerfile.alpine-latest

@@ -3,6 +3,7 @@ FROM alpine:latest
 RUN apk add \
     py3-clang \
     clang-dev \
+    musl-dev \
     make
 
 ARG UID=1000

docker/Dockerfile.fedora-37 → docker/Dockerfile.fedora-39

@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:39
 
 RUN dnf -y update && \
     dnf -y upgrade && \

docker/Dockerfile.fedora-38 → docker/Dockerfile.fedora-40

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:40
 
 RUN dnf -y update && \
     dnf -y upgrade && \

docker/Dockerfile.fedora-41

@@ -0,0 +1,25 @@
+FROM fedora:41
+
+RUN dnf -y update && \
+    dnf -y upgrade && \
+    dnf -y install \
+	python3-clang \
+	make && \
+    dnf clean all
+
+ARG UID=1000
+ARG GID=1000
+ARG ARCHIVE
+
+WORKDIR /src
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+ADD ${ARCHIVE} .
+
+RUN sh venv
+
+ENV PATH=".venv/bin:${PATH}"
+
+USER ${UID}:${GID}

test/c/autostruct.rst

@@ -29,7 +29,7 @@
    Named struct.
 
 
-   .. c:struct:: @anonymous_0a4d6f0b47cde0e9872b6dbde2ad1c1a
+   .. c:struct:: @anonymous_a63d10331be1a527625db63b8ace540f
 
       Anonymous sub-struct.
 
@@ -39,7 +39,7 @@
          Member foo.
 
 
-   .. c:union:: @anonymous_22cf17aa0fa6d83246282a58013db249
+   .. c:union:: @anonymous_69382278a84175c1cbff40d522114b38
 
       Anonymous sub-union.
 

test/c/bool.c

@@ -0,0 +1,32 @@
+#include <stdbool.h>
+
+/**
+ * Retain bool instead of using _Bool.
+ */
+static bool convert_bool;
+
+/**
+ * Also convert _Bool to bool.
+ */
+static _Bool convert_Bool;
+
+/**
+ * Bool function.
+ */
+bool boolean(bool bar, _Bool baz);
+
+/**
+ * This is a sample struct
+ *
+ * Woohoo.
+ */
+struct sample_struct {
+	/**
+	 * bool member
+	 */
+	bool bool_member;
+	/**
+	 * _Bool member
+	 */
+	_Bool _Bool_member;
+};

test/c/bool.rst

@@ -0,0 +1,32 @@
+
+.. c:var:: static bool convert_bool
+
+   Retain bool instead of using _Bool.
+
+
+.. c:var:: static bool convert_Bool
+
+   Also convert _Bool to bool.
+
+
+.. c:function:: bool boolean(bool bar, bool baz)
+
+   Bool function.
+
+
+.. c:struct:: sample_struct
+
+   This is a sample struct
+
+   Woohoo.
+
+
+   .. c:member:: bool bool_member
+
+      bool member
+
+
+   .. c:member:: bool _Bool_member
+
+      _Bool member
+

test/c/bool.yaml

@@ -0,0 +1,6 @@
+directives:
+- domain: c
+  directive: autodoc
+  arguments:
+  - bool.c
+expected: bool.rst

test/c/function.c

@@ -1,15 +1,8 @@
-#include <stdbool.h>
-
 /**
  * Foo function.
  */
 static inline int foo(int bar, int baz);
 
-/**
- * Bool function.
- */
-bool boolean(bool bar, _Bool baz);
-
 /**
  * No parameters.
  */

test/c/function.rst

@@ -4,11 +4,6 @@
    Foo function.
 
 
-.. c:function:: bool boolean(bool bar, bool baz)
-
-   Bool function.
-
-
 .. c:function:: int no_parameters(void)
 
    No parameters.

test/c/struct.c

@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 /**
  * This is a sample struct
  *
@@ -10,14 +8,6 @@ struct sample_struct {
 	 * member
 	 */
 	int jesh;
-	/**
-	 * bool member
-	 */
-	bool bool_member;
-	/**
-	 * _Bool member
-	 */
-	_Bool _Bool_member;
 	/**
 	 * array member
 	 */

test/c/struct.rst

@@ -11,16 +11,6 @@
       member
 
 
-   .. c:member:: bool bool_member
-
-      bool member
-
-
-   .. c:member:: bool _Bool_member
-
-      _Bool member
-
-
    .. c:member:: int array_member[5]
 
       array member
@@ -49,7 +39,7 @@
       foo next
 
 
-.. c:struct:: @anonymous_a6168a23d6840e8919ade5661a307607
+.. c:struct:: @anonymous_7bf120438d254a91e1275b973de6a0eb
 
    Anonymous struct documentation.
 
@@ -64,7 +54,7 @@
    Named struct.
 
 
-   .. c:struct:: @anonymous_0a4d6f0b47cde0e9872b6dbde2ad1c1a
+   .. c:struct:: @anonymous_a63d10331be1a527625db63b8ace540f
 
       Anonymous sub-struct.
 
@@ -74,7 +64,7 @@
          Member foo.
 
 
-   .. c:union:: @anonymous_22cf17aa0fa6d83246282a58013db249
+   .. c:union:: @anonymous_69382278a84175c1cbff40d522114b38
 
       Anonymous sub-union.
 

test/c/variable.c

@@ -1,20 +1,8 @@
-#include <stdbool.h>
-
 /**
  * This is a variable document.
  */
 static int sheesh;
 
-/**
- * Retain bool instead of using _Bool.
- */
-static bool convert_bool;
-
-/**
- * Also convert _Bool to bool.
- */
-static _Bool convert_Bool;
-
 /**
  * function pointer variable
  */

test/c/variable.rst

@@ -4,16 +4,6 @@
    This is a variable document.
 
 
-.. c:var:: static bool convert_bool
-
-   Retain bool instead of using _Bool.
-
-
-.. c:var:: static bool convert_Bool
-
-   Also convert _Bool to bool.
-
-
 .. c:var:: int (*function_pointer_variable)(int *param_name_ignored)
 
    function pointer variable

test/conf.py

@@ -3,8 +3,6 @@
 # For the full list of built-in configuration values, see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-from hawkmoth.util import compiler
-
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
@@ -31,10 +29,6 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = None
 
-# -- Options for Hawkmoth ----------------------------------------------------
-# https://jnikula.github.io/hawkmoth/dev/extension.html#configuration
-
-hawkmoth_clang = compiler.get_include_args()
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

test/cpp/function.rst

@@ -4,11 +4,6 @@
    Foo function.
 
 
-.. cpp:function:: bool boolean(bool bar, bool baz)
-
-   Bool function.
-
-
 .. cpp:function:: int no_parameters(void)
 
    No parameters.

test/cpp/struct.rst

@@ -11,16 +11,6 @@
       member
 
 
-   .. cpp:member:: public bool bool_member
-
-      bool member
-
-
-   .. cpp:member:: public bool _Bool_member
-
-      _Bool member
-
-
    .. cpp:member:: public int array_member[5]
 
       array member
@@ -49,7 +39,7 @@
       foo next
 
 
-.. cpp:struct:: @anonymous_a6168a23d6840e8919ade5661a307607
+.. cpp:struct:: @anonymous_7bf120438d254a91e1275b973de6a0eb
 
    Anonymous struct documentation.
 
@@ -64,7 +54,7 @@
    Named struct.
 
 
-   .. cpp:struct:: @anonymous_0a4d6f0b47cde0e9872b6dbde2ad1c1a
+   .. cpp:struct:: @anonymous_a63d10331be1a527625db63b8ace540f
 
       Anonymous sub-struct.
 
@@ -74,7 +64,7 @@
          Member foo.
 
 
-   .. cpp:union:: @anonymous_22cf17aa0fa6d83246282a58013db249
+   .. cpp:union:: @anonymous_69382278a84175c1cbff40d522114b38
 
       Anonymous sub-union.
 

test/cpp/variable.rst

@@ -4,16 +4,6 @@
    This is a variable document.
 
 
-.. cpp:var:: static bool convert_bool
-
-   Retain bool instead of using _Bool.
-
-
-.. cpp:var:: static bool convert_Bool
-
-   Also convert _Bool to bool.
-
-
 .. cpp:var:: int (*function_pointer_variable)(int *param_name_ignored)
 
    function pointer variable

test/testenv.py

@@ -7,14 +7,10 @@
 import pytest
 import strictyaml
 
-from hawkmoth.util import compiler
-
 testext = '.yaml'
 testdir = os.path.dirname(os.path.abspath(__file__))
 rootdir = os.path.dirname(testdir)
 
-_clang_include_args = compiler.get_include_args()
-
 sys.path.insert(0, rootdir)
 
 class Directive:
@@ -49,8 +45,6 @@ def get_directive_string(self):
     def get_clang_args(self):
         clang_args = []
 
-        clang_args.extend(_clang_include_args.copy())
-
         clang_args.extend(self.options.get('clang', []))
 
         return clang_args