diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2018-09-07 14:51:34 +0100 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2018-09-12 15:08:17 +0100 |
| commit | d8b00a7071b6a6544c198be8ce3450969dc5f995 (patch) | |
| tree | 3c4eaebc22908bc0b203fcc44d6c8486bb230359 | |
| parent | 32d0ce664093a3b5256b7af449a047cc4ffe0a87 (diff) | |
| download | buildstream-d8b00a7071b6a6544c198be8ce3450969dc5f995.tar.gz | |
tests: avoid setting max-jobs
Setting "max-jobs" won't be allowed anymore in a following commit.
| -rw-r--r-- | tests/integration/manual.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/integration/manual.py b/tests/integration/manual.py index e71ccdd79..241ea37a8 100644 --- a/tests/integration/manual.py +++ b/tests/integration/manual.py @@ -64,7 +64,7 @@ strip @pytest.mark.datafiles(DATA_DIR) -def test_manual_element_noparallel(cli, tmpdir, datafiles): +def test_manual_element_environment(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) checkout = os.path.join(cli.directory, 'checkout') element_path = os.path.join(project, 'elements') @@ -72,15 +72,11 @@ def test_manual_element_noparallel(cli, tmpdir, datafiles): create_manual_element(element_name, element_path, { 'install-commands': [ - "echo $MAKEFLAGS >> test", "echo $V >> test", "cp test %{install-root}" ] }, { - 'max-jobs': 2, - 'notparallel': True }, { - 'MAKEFLAGS': '-j%{max-jobs} -Wall', 'V': 2 }) @@ -93,13 +89,11 @@ def test_manual_element_noparallel(cli, tmpdir, datafiles): with open(os.path.join(checkout, 'test')) as f: text = f.read() - assert text == """-j1 -Wall -2 -""" + assert text == "2\n" @pytest.mark.datafiles(DATA_DIR) -def test_manual_element_environment(cli, tmpdir, datafiles): +def test_manual_element_noparallel(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) checkout = os.path.join(cli.directory, 'checkout') element_path = os.path.join(project, 'elements') @@ -112,7 +106,7 @@ def test_manual_element_environment(cli, tmpdir, datafiles): "cp test %{install-root}" ] }, { - 'max-jobs': 2 + 'notparallel': True }, { 'MAKEFLAGS': '-j%{max-jobs} -Wall', 'V': 2 @@ -127,6 +121,6 @@ def test_manual_element_environment(cli, tmpdir, datafiles): with open(os.path.join(checkout, 'test')) as f: text = f.read() - assert text == """-j2 -Wall + assert text == """-j1 -Wall 2 """ |