Er, actually make this test meaningful. It now aborts correctly if you try to

launch stage2 directly, rather than giving an obscure error about the tool
later on.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2527

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index a8a09b5cf2f2dca37393b6d6ad93748155373458..9b5bd8177ec47a09a219ff04e2479915e746a071 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -473,8 +473,8 @@ static void scan_auxv(void)
         break;
       }
 
-   if ( ! (1|2) ) {
-      fprintf(stderr, "stage2 must be launched by stage1\n");
+   if ( found != (1|2) ) {
+      fprintf(stderr, "valgrind: stage2 must be launched by stage1\n");
       exit(127);
    }
 }