From 20aa7b8ec15766937c0a500abe0c1e740ee0fcf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <kraen.hansen@realm.io>
Date: Tue, 15 Aug 2017 01:55:24 +0200
Subject: [PATCH] Moved the ingoring of realm-object-server folders to the
 outmost .gitignore

---
 .gitignore       | 5 ++++-
 tests/.gitignore | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59e6e5cb..2031f791 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,7 +117,10 @@ local.properties
 tsconfig.json
 
 # Tests
-object-server-for-testing/
+object-server-for-testing
+# Some tests will spin up ROS in their own folder - this needs to be in this .gitignore for
+# npm to be able to pack realm, as the "realm-object-server" folders contain FIFO pipes.
+realm-object-server
 vendor/sync
 vendor/sync*
 packager_out.txt
diff --git a/tests/.gitignore b/tests/.gitignore
index 2d9a2fc3..86c86b70 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -2,5 +2,3 @@
 
 # Ignore the JUnit/XML formatted test results in the environment specific folders
 junitresults-*.xml
-# Some tests will spin up ROS
-realm-object-server