From 64e8c978e4ef396d5cfd1faf7e66d293b026b016 Mon Sep 17 00:00:00 2001
From: Matt Colyer <mcolyer@github.com>
Date: Mon, 7 Oct 2013 14:28:13 -0700
Subject: [PATCH] Return proper return code from atom.sh

Also improve the test failure message returned by apm.
---
 atom.sh    | 1 +
 vendor/apm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/atom.sh b/atom.sh
index 53de6a493..6ee2b9990 100755
--- a/atom.sh
+++ b/atom.sh
@@ -32,6 +32,7 @@ done
 
 if [ $EXPECT_OUTPUT ]; then
   $ATOM_BINARY --executed-from="$(pwd)" --pid=$$ $@
+  exit $?
 else
   open -a $ATOM_PATH -n --args --executed-from="$(pwd)" --pid=$$ $@
 fi
diff --git a/vendor/apm b/vendor/apm
index 162824eb1..fcb19e296 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 162824eb1a73c154e3bf823c591fa42f8ebcaa37
+Subproject commit fcb19e296ca8979a28d2d503c2650f4ef381c8be