From ffb13b1e698b52b39a137ffa6ee3d2e28b838f3e Mon Sep 17 00:00:00 2001
From: Iain Beeston <iain.beeston@gmail.com>
Date: Wed, 28 Jan 2015 11:34:47 +0000
Subject: [PATCH] Made sure we really do update the common test suite before
 test runs

It seems that the code we have for updating submodules wasn't really
working. So far as I can tell it was not updating the code in the
submodule from the remote repository, and the .gitmodules file was set
to track master, not develop (which is the default on the common test
suite project)
---
 .gitmodules     | 1 +
 Rakefile        | 2 +-
 test/test-suite | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 54d5c5e2..ea9a7388 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "test/test-suite"]
 	path = test/test-suite
+	branch = develop
 	url = git://github.com/json-schema/JSON-Schema-Test-Suite.git
diff --git a/Rakefile b/Rakefile
index 17b40644..a6a66259 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ task :update_common_tests do
   unless File.read(".git/config").include?('submodule "test/test-suite"')
     sh "git submodule init"
   end
-  sh "git submodule update --quiet"
+  sh "git submodule update --remote --quiet"
 end
 
 Rake::TestTask.new do |t|
diff --git a/test/test-suite b/test/test-suite
index 9208016d..a7944d18 160000
--- a/test/test-suite
+++ b/test/test-suite
@@ -1 +1 @@
-Subproject commit 9208016d04c1b6774d5a17e8b037161873414edb
+Subproject commit a7944d1850a18e4d0ad3bccc431be05f195111bf