Skip to content

Commit

Permalink
Revert "test: query system include args from clang"
Browse files Browse the repository at this point in the history
This reverts commit a114bf7 ("test: query system include args from
clang").

This is no longer an issue with any of the current Docker images, and
with the C/C++ includes sorted out. We should try to trust libclang to
have the header search path right.
  • Loading branch information
jnikula committed Sep 11, 2024
1 parent ee79b6c commit 1243852
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 14 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions test/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
6 changes: 0 additions & 6 deletions test/testenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1243852

Please sign in to comment.