From e7bc9db0a3c60ae11396ad8000be3bab66e35280 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 13 Oct 2015 12:35:42 -0400
Subject: [PATCH] Bug 1214256 - Add talos virtualenv and tp5n files to
 .hgignore and .gitignore. r=gps

--HG--
extra : transplant_source : %E0%7C%8EX%E1i%E6%B6V%01%97%88y%17%EA%07%08%1FK8
---
 .gitignore | 12 ++++++++++++
 .hgignore  | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4e9429df16511..92015b63dc56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,15 @@ mobile/android/gradle/.gradle
 
 # Ignore node_modules from eslint-plugin-mozilla
 testing/eslint-plugin-mozilla/node_modules/
+
+# Ignore talos virtualenv and tp5n files.
+# The tp5n set is supposed to be decompressed at
+# testing/talos/talos/page_load_test/tp5n in order to run tests like tps
+# locally. Similarly, running talos requires a Python package virtual
+# environment. Both the virtual environment and tp5n files end up littering
+# the status command, so we ignore them.
+testing/talos/.Python
+testing/talos/bin/
+testing/talos/include/
+testing/talos/lib/
+testing/talos/talos/page_load_test/tp5n/
diff --git a/.hgignore b/.hgignore
index 847b0faeccd0d..dbff46258da07 100644
--- a/.hgignore
+++ b/.hgignore
@@ -96,3 +96,15 @@ GPATH
 
 # Ignore node_modules from eslint-plugin-mozilla
 ^testing/eslint-plugin-mozilla/node_modules/
+
+# Ignore talos virtualenv and tp5n files.
+# The tp5n set is supposed to be decompressed at
+# testing/talos/talos/page_load_test/tp5n in order to run tests like tps
+# locally. Similarly, running talos requires a Python package virtual
+# environment. Both the virtual environment and tp5n files end up littering
+# the status command, so we ignore them.
+^testing/talos/.Python
+^testing/talos/bin/
+^testing/talos/include/
+^testing/talos/lib/
+^testing/talos/talos/page_load_test/tp5n/