Restore ability to run with no instrumentation.


git-svn-id: svn://svn.valgrind.org/vex/trunk@565 8f6e269a-dfd6-0310-a8e1-e2731360e62c
diff --git a/test_main.c b/test_main.c
index 2e5fd30..cb77fdb 100644
--- a/test_main.c
+++ b/test_main.c
@@ -125,12 +125,17 @@
                  origbuf, (Addr64)orig_addr, chase_into_not_ok,
                  &orig_used,
                  transbuf, N_TRANSBUF, &trans_used,
+#if 1 /* no instrumentation */
+                 NULL,          /* instrument1 */
+                 NULL,          /* instrument2 */
+		 False,         /* cleanup after instrument */
+#endif
 #if 0 /* addrcheck */
                  ac_instrument, /* instrument1 */
                  NULL,          /* instrument2 */
 		 False,         /* cleanup after instrument */
 #endif
-#if 1 /* memcheck */
+#if 0 /* memcheck */
                  mc_instrument, /* instrument1 */
                  NULL,          /* instrument2 */
 		 False,         /* cleanup after instrument */