diff options
-rw-r--r-- | bitbake/lib/toaster/tests/builds/buildtest.py | 9 | ||||
-rw-r--r-- | bitbake/lib/toaster/tox.ini | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/tests/builds/buildtest.py b/bitbake/lib/toaster/tests/builds/buildtest.py index 13b51fb0d8..53cd7a9ffa 100644 --- a/bitbake/lib/toaster/tests/builds/buildtest.py +++ b/bitbake/lib/toaster/tests/builds/buildtest.py | |||
@@ -116,6 +116,15 @@ class BuildTest(unittest.TestCase): | |||
116 | project = Project.objects.create_project(name=BuildTest.PROJECT_NAME, | 116 | project = Project.objects.create_project(name=BuildTest.PROJECT_NAME, |
117 | release=release) | 117 | release=release) |
118 | 118 | ||
119 | passthrough_variable_names = ["SSTATE_DIR", "DL_DIR"] | ||
120 | for variable_name in passthrough_variable_names: | ||
121 | current_variable = os.environ.get(variable_name) | ||
122 | if current_variable: | ||
123 | ProjectVariable.objects.get_or_create( | ||
124 | name=variable_name, | ||
125 | value=current_variable, | ||
126 | project=project) | ||
127 | |||
119 | if os.environ.get("TOASTER_TEST_USE_SSTATE_MIRROR"): | 128 | if os.environ.get("TOASTER_TEST_USE_SSTATE_MIRROR"): |
120 | ProjectVariable.objects.get_or_create( | 129 | ProjectVariable.objects.get_or_create( |
121 | name="SSTATE_MIRRORS", | 130 | name="SSTATE_MIRRORS", |
diff --git a/bitbake/lib/toaster/tox.ini b/bitbake/lib/toaster/tox.ini index d058558b05..9928657106 100644 --- a/bitbake/lib/toaster/tox.ini +++ b/bitbake/lib/toaster/tox.ini | |||
@@ -5,6 +5,9 @@ toxworkdir = {env:TOX_WORKDIR:.tox} | |||
5 | passenv = * | 5 | passenv = * |
6 | 6 | ||
7 | [testenv] | 7 | [testenv] |
8 | passenv = | ||
9 | SSTATE_DIR | ||
10 | DL_DIR | ||
8 | setenv = | 11 | setenv = |
9 | DJANGO_SETTINGS_MODULE=toastermain.settings_test | 12 | DJANGO_SETTINGS_MODULE=toastermain.settings_test |
10 | TOASTER_BUILDSERVER=1 | 13 | TOASTER_BUILDSERVER=1 |