Revert "Make GYP build usable for day-to-day work"

tools/test.py

Index: tools/test.py
diff --git a/tools/test.py b/tools/test.py
index f7545fb10b713d02d5d08dddb7cfb3eaa4a5f8d7..ec21ffed946bc30e64616a3453837eced8b2626b 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1181,8 +1181,6 @@ def BuildOptions():
       default=False, action="store_true")
   result.add_option("--build-only", help="Only build requirements, don't run the tests",
       default=False, action="store_true")
-  result.add_option("--build-system", help="Build system in use (scons or gyp)",
-      default='scons')
   result.add_option("--report", help="Print a summary of the tests to be run",
       default=False, action="store_true")
   result.add_option("-s", "--suite", help="A test suite",
@@ -1282,10 +1280,6 @@ def ProcessOptions(options):
   if options.noprof:
     options.scons_flags.append("prof=off")
     options.scons_flags.append("profilingsupport=off")
-  if options.build_system == 'gyp':
-    if options.build_only:
-      print "--build-only not supported for gyp, please build manually."
-      options.build_only = False
   return True
 
 
@@ -1405,9 +1399,6 @@ def Main():
     run_valgrind = join(workspace, "tools", "run-valgrind.py")
     options.special_command = "python -u " + run_valgrind + " @"
 
-  if options.build_system == 'gyp':
-    SUFFIX['debug'] = ''
-
   shell = abspath(options.shell)
   buildspace = dirname(shell)