From e1bb241b51102a4212f71bc525b1c6687326d180 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 1 Aug 2011 03:21:28 +0200
Subject: [PATCH] test: add targets `test-http2` and `test-all-http2`

Passes `--use-http2` to node. Fixes #1430.
---
 Makefile      |  6 ++++++
 tools/test.py | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 84174032bdc..f2f8889d0de 100644
--- a/Makefile
+++ b/Makefile
@@ -35,12 +35,18 @@ uninstall:
 test: all
 	python tools/test.py --mode=release simple message
 
+test-http2: all
+	python tools/test.py --mode=release --use-http2 simple message
+
 test-valgrind: all
 	python tools/test.py --mode=release --valgrind simple message
 
 test-all: all
 	python tools/test.py --mode=debug,release
 
+test-all-http2: all
+	python tools/test.py --mode=debug,release --use-http2
+
 test-all-valgrind: all
 	python tools/test.py --mode=debug,release --valgrind
 
diff --git a/tools/test.py b/tools/test.py
index d3c24e2b0c3..b746cd6d322 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1148,6 +1148,8 @@ def BuildOptions():
   result.add_option("--simulator", help="Run tests with architecture simulator",
       default='none')
   result.add_option("--special-command", default=None)
+  result.add_option("--use-http2", help="Pass --use-http2 switch to node",
+      default=False, action="store_true")
   result.add_option("--valgrind", help="Run tests through valgrind",
       default=False, action="store_true")
   result.add_option("--cat", help="Print the source of the tests",
@@ -1306,10 +1308,18 @@ def Main():
   shell = abspath(options.shell)
   buildspace = dirname(shell)
 
-  context = Context(workspace, buildspace, VERBOSE,
+  processor = GetSpecialCommandProcessor(options.special_command)
+  if options.use_http2:
+    def wrap(processor):
+      return lambda args: processor(args[:1] + ['--use-http2'] + args[1:])
+    processor = wrap(processor)
+
+  context = Context(workspace,
+                    buildspace,
+                    VERBOSE,
                     shell,
                     options.timeout,
-                    GetSpecialCommandProcessor(options.special_command),
+                    processor,
                     options.suppress_dialogs,
                     options.store_unexpected_output)
   # First build the required targets