diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2020-01-09 01:28:06 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-10 21:24:10 -0800 |
| commit | 5d87500892d128cbeb10fe52936ddafcccc22770 (patch) | |
| tree | f25c92117098ad39b6edee1647b2dbdace9d3d7e | |
| parent | 788dbc5022890e312a5e16a2a18a7df7237a75a6 (diff) | |
grc: Set GRC_BLOCKS_PATH to the local blocks directory
Remove expected failures from 3 tests
| -rw-r--r-- | grc/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/tests/test_compiler.py | 1 | ||||
| -rw-r--r-- | grc/tests/test_cpp.py | 1 | ||||
| -rw-r--r-- | grc/tests/test_generator.py | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/grc/tests/CMakeLists.txt b/grc/tests/CMakeLists.txt index 7b2ab39307..8575fb62b0 100644 --- a/grc/tests/CMakeLists.txt +++ b/grc/tests/CMakeLists.txt @@ -27,6 +27,7 @@ if(ENABLE_TESTING) ) if(PYTEST_FOUND) + set(GR_TEST_ENVIRONS "GRC_BLOCKS_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/../blocks\"") GR_ADD_TEST(grc_tests ${QA_PYTHON_EXECUTABLE} -B -m pytest ${CMAKE_CURRENT_SOURCE_DIR}) endif() endif(ENABLE_TESTING) diff --git a/grc/tests/test_compiler.py b/grc/tests/test_compiler.py index b47209d477..601b00897d 100644 --- a/grc/tests/test_compiler.py +++ b/grc/tests/test_compiler.py @@ -25,7 +25,6 @@ import tempfile from grc.compiler import main -@pytest.mark.xfail(reason="core/platform.py:198 self.blocks['options']) throws KeyError") def test_compiler(capsys): args = Namespace( output=tempfile.gettempdir(), diff --git a/grc/tests/test_cpp.py b/grc/tests/test_cpp.py index eedd0491bc..be7fb07dea 100644 --- a/grc/tests/test_cpp.py +++ b/grc/tests/test_cpp.py @@ -25,7 +25,6 @@ import tempfile from grc.compiler import main -@pytest.mark.xfail(reason="core/platform.py:198 self.blocks['options']) throws KeyError") def test_cpp(capsys): args = Namespace( output=tempfile.gettempdir(), diff --git a/grc/tests/test_generator.py b/grc/tests/test_generator.py index e54a90ffd6..c6f0283ac1 100644 --- a/grc/tests/test_generator.py +++ b/grc/tests/test_generator.py @@ -25,7 +25,6 @@ import tempfile from grc.core.platform import Platform -@pytest.mark.xfail(reason="core/platform.py:198 self.blocks['options']) throws KeyError") def test_generator(): # c&p form compiler code. # todo: make this independent from installed GR |