Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: scripts/slave/unittests/recipe_simulation_test.py

Issue 1347263002: Revert of Cross-repo recipe package system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/unittests/recipe_lint_test.py ('k') | scripts/tools/show_me_the_modules.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/unittests/recipe_simulation_test.py
diff --git a/scripts/slave/unittests/recipe_simulation_test.py b/scripts/slave/unittests/recipe_simulation_test.py
index 5e5b9315f5383fcd893b45a85317d8933bd70e25..abb4bedc7d6155dabb78b9c40e0e7b1f2577e815 100755
--- a/scripts/slave/unittests/recipe_simulation_test.py
+++ b/scripts/slave/unittests/recipe_simulation_test.py
@@ -4,22 +4,12 @@
# found in the LICENSE file.
import os
-import shutil
import sys
import test_env # pylint: disable=W0403,W0611
-# Delete the old recipe_engine directory which might have stale pyc files
-# that will mess us up.
-shutil.rmtree(os.path.join(
- os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(
- os.path.realpath(__file__))))),
- 'third_party', 'recipe_engine'),
- ignore_errors=True)
+from recipe_engine import simulation_test
+from slave import recipe_universe
-RECIPES_PY = os.path.join(
- os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
- 'recipes.py')
-
-args = [sys.argv[0], 'simulation_test'] + sys.argv[1:]
-os.execvp(RECIPES_PY, args)
+if __name__ == '__main__':
+ simulation_test.main(recipe_universe.get_universe())
« no previous file with comments | « scripts/slave/unittests/recipe_lint_test.py ('k') | scripts/tools/show_me_the_modules.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698