Do Massif output file name properly. Default is massif.out.%p, where %p

expands to the PID.  Updated the tests.  Still todo:  handle %q for
environment variables, and do the same for the core and
Cachegrind/Callgrind.

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

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 103d27e8c89d61738d015ba633642c1dff260282..76b43d9d9022eff5a205d6be27fb7a719ff21f7f 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -326,8 +326,8 @@ static SizeT peak_snapshot_total_szB = 0;
 // memory.  An alternative to milliseconds as a unit of program "time".
 static ULong total_allocs_deallocs_szB = 0;
 
-// Current directory at startup.
-static Char base_dir[VKI_PATH_MAX]; // XXX: currently unused
+// The output file name.  Controlled by --massif-out-file.
+static Char* massif_out_file = NULL;
 
 // We don't start taking snapshots until the first basic block is executed,
 // rather than doing it in ms_post_clo_init (which is the obvious spot), for
@@ -420,6 +420,7 @@ static double clo_peak_inaccuracy = 1.0;  // percentage
 static UInt   clo_time_unit       = TimeMS;
 static UInt   clo_detailed_freq   = 10;
 static UInt   clo_max_snapshots   = 100;
+static Char*  clo_massif_out_file = "massif.out.%p";
 
 static XArray* args_for_massif;
 
@@ -450,6 +451,10 @@ static Bool ms_process_cmd_line_option(Char* arg)
       VG_(addToXA)(alloc_fns, &alloc_fn);
    }
 
+   else if (VG_CLO_STREQN(14, arg, "--massif-out-file=")) {
+      clo_massif_out_file = &arg[18];
+   }
+
    else
       return VG_(replacement_malloc_process_cmd_line_option)(arg);
 
@@ -471,6 +476,7 @@ static void ms_print_usage(void)
 "                               alloc'd/dealloc'd on the heap [ms]\n"
 "    --detailed-freq=<N>       every Nth snapshot should be detailed [10]\n"
 "    --max-snapshots=<N>       maximum number of snapshots recorded [100]\n"
+"    --massif-out-file=<s>     output file name [massif.out.%%p]\n"
    );
    VG_(replacement_malloc_print_usage)();
 }
@@ -1809,9 +1815,6 @@ IRSB* ms_instrument ( VgCallbackClosure* closure,
 //--- Writing snapshots                                    ---//
 //------------------------------------------------------------//
 
-// XXX: do the filename properly, eventually
-static Char* massif_out_file = "massif.out";
-
 #define FP_BUF_SIZE     1024
 Char FP_buf[FP_BUF_SIZE];
 
@@ -2049,6 +2052,69 @@ static void ms_fini(Int exit_status)
 //--- Initialisation                                       ---//
 //------------------------------------------------------------//
 
+// Copies the string, prepending it with the startup working directory, and
+// expanding %p and %q entries.  Returns a new, malloc'd string.
+static Char* expand_file_name(Char* format)
+{
+   static Char base_dir[VKI_PATH_MAX];
+   Int len, i = 0, j = 0;
+   Char* out;
+
+   Bool ok = VG_(get_startup_wd)(base_dir, VKI_PATH_MAX);
+   tl_assert(ok);
+
+   // The 10 is slop, it should be enough in most cases.
+   j = VG_(strlen)(base_dir);
+   len = j + VG_(strlen)(format) + 10;
+   out = VG_(malloc)( len );
+   VG_(strcpy)(out, base_dir);
+
+#define GROW_IF_j_IS_GEQ_THAN(x) \
+   if (j >= x) { \
+      len *= 2; \
+      out = VG_(realloc)(out, len); \
+      OINK(len);\
+   }
+
+   out[j++] = '/';
+   while (format[i]) {
+      if (format[i] != '%') {
+         GROW_IF_j_IS_GEQ_THAN(len);
+         out[j++] = format[i++];
+         
+      } else {
+         // We saw a '%'.  What's next...
+         i++;
+         if      (0   == format[i]) {
+            // At end of string, stop.
+            break;
+         }
+         else if ('%' == format[i]) {
+            // Replace '%%' with '%'.
+            GROW_IF_j_IS_GEQ_THAN(len);
+            out[j++] = format[i++];
+         }
+         else if ('p' == format[i]) {
+            // Print the PID.
+            GROW_IF_j_IS_GEQ_THAN(len - 10);
+            j += VG_(sprintf)(&out[j], "%d", VG_(getpid)());
+            i++;
+         } 
+         else {
+            // Other char, treat both the '%' and its subsequent normally.
+            GROW_IF_j_IS_GEQ_THAN(len - 1);
+            out[j++] = '%';
+            out[j++] = format[i++];
+         }
+      }
+   }
+   GROW_IF_j_IS_GEQ_THAN(len);
+   out[j++] = 0;
+
+   return out;
+}
+
+
 static void ms_post_clo_init(void)
 {
    Int i;
@@ -2106,6 +2172,9 @@ static void ms_post_clo_init(void)
       clear_snapshot( & snapshots[i], /*do_sanity_check*/False );
    }
    sanity_check_snapshots_array();
+
+   // Setup output filename.
+   massif_out_file = expand_file_name(clo_massif_out_file);
 }
 
 static void ms_pre_clo_init(void)
@@ -2152,8 +2221,6 @@ static void ms_pre_clo_init(void)
 
    // Initialise args_for_massif.
    args_for_massif = VG_(newXA)(VG_(malloc), VG_(free), sizeof(HChar*));
-
-   tl_assert( VG_(get_startup_wd)(base_dir, VKI_PATH_MAX) );
 }
 
 VG_DETERMINE_INTERFACE_VERSION(ms_pre_clo_init)

diff --git a/massif/tests/alloc-fns-A.post.exp b/massif/tests/alloc-fns-A.post.exp
index 659ca2e32f3e6ae8e2ebe7b9a6277dcba51dc467..9a21059addc22eb49a00c8646c90c42d8c334ccf 100644 (file)
--- a/massif/tests/alloc-fns-A.post.exp
+++ b/massif/tests/alloc-fns-A.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./alloc-fns
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/alloc-fns-A.vgtest b/massif/tests/alloc-fns-A.vgtest
index 9200a80da2e3fb55c69756e87530a9edcfa6f609..ab6615aa4ec0649c7bc13876555e0687c96c2975 100644 (file)
--- a/massif/tests/alloc-fns-A.vgtest
+++ b/massif/tests/alloc-fns-A.vgtest
@@ -1,4 +1,4 @@
 prog: alloc-fns
-vgopts: --stacks=no --time-unit=B --heap-admin=0
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/alloc-fns-B.post.exp b/massif/tests/alloc-fns-B.post.exp
index 82765e05efd6d05c2681872baa5cc955a4af69c3..3712260d590f05b0dfacc1cc3716e80d1160480a 100644 (file)
--- a/massif/tests/alloc-fns-B.post.exp
+++ b/massif/tests/alloc-fns-B.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./alloc-fns
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/alloc-fns-B.vgtest b/massif/tests/alloc-fns-B.vgtest
index fab2b46cba80b238afa42a4882b4784993c4555e..44a6b60a2a06e4fcba506b81b2b5ac91a9277ed8 100644 (file)
--- a/massif/tests/alloc-fns-B.vgtest
+++ b/massif/tests/alloc-fns-B.vgtest
@@ -1,4 +1,4 @@
 prog: alloc-fns
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/basic.post.exp b/massif/tests/basic.post.exp
index 53b96780187c699cc4c917f20f4b7ddb26db12c6..8cda5873f78d79dafdd761e927eccf44b5040d65 100644 (file)
--- a/massif/tests/basic.post.exp
+++ b/massif/tests/basic.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./basic
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/basic.vgtest b/massif/tests/basic.vgtest
index 41124cd27acf8b2db4907726a64344fb41dd7162..a4f52a7b50f61c6f32c6c77b9440438dadcb68b5 100644 (file)
--- a/massif/tests/basic.vgtest
+++ b/massif/tests/basic.vgtest
@@ -1,4 +1,4 @@
 prog: basic
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/big-alloc.post.exp b/massif/tests/big-alloc.post.exp
index 383645d3dcc754f4607f716fe66b301cb032378f..75c4d34fc3e7d5be58d344d3e6736e8f0ad27165 100644 (file)
--- a/massif/tests/big-alloc.post.exp
+++ b/massif/tests/big-alloc.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./big-alloc
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/big-alloc.vgtest b/massif/tests/big-alloc.vgtest
index b765673bdb941c302abe2ad019dc1cb3500b58bd..abdefddde30961eccb421e200d165d8da541b68c 100644 (file)
--- a/massif/tests/big-alloc.vgtest
+++ b/massif/tests/big-alloc.vgtest
@@ -1,4 +1,4 @@
 prog: big-alloc
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/culling1.vgtest b/massif/tests/culling1.vgtest
index 50918cd03a9826797ee7f1d7079f1a2c65c52102..81775bed7b7b5fdf71a15839850768c0f8e85fb0 100644 (file)
--- a/massif/tests/culling1.vgtest
+++ b/massif/tests/culling1.vgtest
@@ -1,4 +1,4 @@
 prog: culling1
-vgopts: -v -v --stacks=no --time-unit=B
+vgopts: -v -v --stacks=no --time-unit=B --massif-out-file=massif.out
 stderr_filter: filter_verbose
 cleanup: rm massif.out

diff --git a/massif/tests/culling2.vgtest b/massif/tests/culling2.vgtest
index 29f13ff3f3fdab3e4d6ebc2e1e66ad753bc9d034..a8c6e46cf2676bd015ea7f96927e413c44ed3ef3 100644 (file)
--- a/massif/tests/culling2.vgtest
+++ b/massif/tests/culling2.vgtest
@@ -1,4 +1,4 @@
 prog: culling2
-vgopts: -v -v --stacks=no --time-unit=B
+vgopts: -v -v --stacks=no --time-unit=B --massif-out-file=massif.out
 stderr_filter: filter_verbose
 cleanup: rm massif.out

diff --git a/massif/tests/custom_alloc.post.exp b/massif/tests/custom_alloc.post.exp
index 98738b3917f045b77749d8b419a755f5e56a6026..8fcc672bb97222d591b76e2ef01e0d8eee8808b1 100644 (file)
--- a/massif/tests/custom_alloc.post.exp
+++ b/massif/tests/custom_alloc.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./custom_alloc
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/custom_alloc.vgtest b/massif/tests/custom_alloc.vgtest
index b83b4c0b4524896b908687da5b5fc5f9f9492f32..72837df2a3f7f527fe083fb094e52c6027f78679 100644 (file)
--- a/massif/tests/custom_alloc.vgtest
+++ b/massif/tests/custom_alloc.vgtest
@@ -1,4 +1,4 @@
 prog: custom_alloc
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/deep-A.post.exp b/massif/tests/deep-A.post.exp
index 577974bc3e606142c4aa98d6ed472696c52c559f..c84218a5e8c425ba822675d51b9e5069df2f951f 100644 (file)
--- a/massif/tests/deep-A.post.exp
+++ b/massif/tests/deep-A.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./deep
-Massif arguments:   --stacks=no --time-unit=B --depth=8
+Massif arguments:   --stacks=no --time-unit=B --depth=8 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/deep-A.vgtest b/massif/tests/deep-A.vgtest
index 2126c959013568c56c3ae991bfd9d869284ddd8d..20a81a77277f0b2c3c45213eff526f157a36233b 100644 (file)
--- a/massif/tests/deep-A.vgtest
+++ b/massif/tests/deep-A.vgtest
@@ -1,4 +1,4 @@
 prog: deep
-vgopts: --stacks=no --time-unit=B --depth=8
+vgopts: --stacks=no --time-unit=B --depth=8 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/deep-B.post.exp b/massif/tests/deep-B.post.exp
index 4fbfde079006743087bc42adfb208027810356ac..2e4ceed245f6539c337d6e42dfa1a0af01b397f0 100644 (file)
--- a/massif/tests/deep-B.post.exp
+++ b/massif/tests/deep-B.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./deep
-Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --depth=8
+Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --depth=8 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/deep-B.vgtest b/massif/tests/deep-B.vgtest
index 6f89e2debe4a2ca670ca84e386e12dad23b35127..46c305e7f6a41b6f502e7ec9e9ba62984cc11810 100644 (file)
--- a/massif/tests/deep-B.vgtest
+++ b/massif/tests/deep-B.vgtest
@@ -1,5 +1,5 @@
 prog: deep
-vgopts: --stacks=no --time-unit=B --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 -v -v --depth=8
+vgopts: --stacks=no --time-unit=B --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 -v -v --depth=8 --massif-out-file=massif.out
 stderr_filter: filter_verbose
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/deep-C.post.exp b/massif/tests/deep-C.post.exp
index 9c6fabba8f31b2dcda1508b27ba24414d43780cd..06f2a68253fc10274e92a0eaaeb83c1ee9718e31 100644 (file)
--- a/massif/tests/deep-C.post.exp
+++ b/massif/tests/deep-C.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./deep
-Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --depth=8
+Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --depth=8 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/deep-C.vgtest b/massif/tests/deep-C.vgtest
index cea898ba1166ab6d74b4bbda9776d7c0f594a624..9cda9ed441f1024df9f2ba6040cd33d376116a73 100644 (file)
--- a/massif/tests/deep-C.vgtest
+++ b/massif/tests/deep-C.vgtest
@@ -1,5 +1,5 @@
 prog: deep
-vgopts: --stacks=no --time-unit=B --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 -v -v --depth=8
+vgopts: --stacks=no --time-unit=B --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 -v -v --depth=8 --massif-out-file=massif.out
 stderr_filter: filter_verbose
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/deep-D.post.exp b/massif/tests/deep-D.post.exp
index fb7fbcdb45ddb39abe03ae439227f9ef9a0e0f3b..b5da9226f64a08fec0422e99dfcf86542e2bc25e 100644 (file)
--- a/massif/tests/deep-D.post.exp
+++ b/massif/tests/deep-D.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./deep
-Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a1 --alloc-fn=a2 --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --alloc-fn=main --depth=20
+Massif arguments:   --stacks=no --time-unit=B --alloc-fn=a1 --alloc-fn=a2 --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --alloc-fn=main --depth=20 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/deep-D.vgtest b/massif/tests/deep-D.vgtest
index 681f8d203f6d26ad04839c85fdaa677198def63e..27b92adb376419a566016a2af2652d1ec7ab6ac1 100644 (file)
--- a/massif/tests/deep-D.vgtest
+++ b/massif/tests/deep-D.vgtest
@@ -1,4 +1,4 @@
 prog: deep
-vgopts: --stacks=no --time-unit=B --alloc-fn=a1 --alloc-fn=a2 --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --alloc-fn=main --depth=20
+vgopts: --stacks=no --time-unit=B --alloc-fn=a1 --alloc-fn=a2 --alloc-fn=a3 --alloc-fn=a4 --alloc-fn=a5 --alloc-fn=a6 --alloc-fn=a7 --alloc-fn=a8 --alloc-fn=a9 --alloc-fn=a10 --alloc-fn=a11 --alloc-fn=a12 --alloc-fn=main --depth=20 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses | ../../tests/filter_libc
 cleanup: rm massif.out

diff --git a/massif/tests/ignoring.post.exp b/massif/tests/ignoring.post.exp
index 2fe6475bef5502b0ec8b5334eff84aa19d0fd6d4..e21b19e34a97b24351e2022271fd78e8ababb908 100644 (file)
--- a/massif/tests/ignoring.post.exp
+++ b/massif/tests/ignoring.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./ignoring
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/ignoring.vgtest b/massif/tests/ignoring.vgtest
index 62084fe000d55d507b7e461dcb81df2c0fd2a613..0a22e40c740d4fc7da9dec417deda49c8e8a8d45 100644 (file)
--- a/massif/tests/ignoring.vgtest
+++ b/massif/tests/ignoring.vgtest
@@ -1,4 +1,4 @@
 prog: ignoring
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/insig.post.exp b/massif/tests/insig.post.exp
index 2e00dc659f0d9d487b82c7f463934a9df6d045bc..b1e5160acf59bb2a11350a0ed5d4915bf1fef5cd 100644 (file)
--- a/massif/tests/insig.post.exp
+++ b/massif/tests/insig.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./insig
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=64
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=64 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/insig.vgtest b/massif/tests/insig.vgtest
index a57d26583158463c361adff40bc8da1056946f11..7758d3994ef417a213891c131702ef78d62b6a1a 100644 (file)
--- a/massif/tests/insig.vgtest
+++ b/massif/tests/insig.vgtest
@@ -1,4 +1,4 @@
 prog: insig
-vgopts: --stacks=no --time-unit=B --heap-admin=64
+vgopts: --stacks=no --time-unit=B --heap-admin=64 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/long-time.post.exp b/massif/tests/long-time.post.exp
index 981915e8e0267a6703f8b97b7d72c7e611422b99..80e91638ae6301de6b70a63998cb28b5a0df395a 100644 (file)
--- a/massif/tests/long-time.post.exp
+++ b/massif/tests/long-time.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./long-time
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/long-time.vgtest b/massif/tests/long-time.vgtest
index 121ab4b883116fd364033885a345b29c8a7febf5..83757eea512673da4f19fbb35a781cb4dd939392 100644 (file)
--- a/massif/tests/long-time.vgtest
+++ b/massif/tests/long-time.vgtest
@@ -1,4 +1,4 @@
 prog: long-time
-vgopts: --stacks=no --time-unit=B --heap-admin=0
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/new-cpp.post.exp b/massif/tests/new-cpp.post.exp
index cf950db5824a039b6469a9d82a161c9c310d8952..31ecbb34ee36cd36e79646d9149e8d7dd8d27dfe 100644 (file)
--- a/massif/tests/new-cpp.post.exp
+++ b/massif/tests/new-cpp.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./new-cpp
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/new-cpp.vgtest b/massif/tests/new-cpp.vgtest
index a31d76412637eafbd4335564424e51eb84f1197a..72471d4d204fe74cc5dc541172108ad92fb62d11 100644 (file)
--- a/massif/tests/new-cpp.vgtest
+++ b/massif/tests/new-cpp.vgtest
@@ -1,4 +1,4 @@
 prog: new-cpp
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/no-stack-no-heap.post.exp b/massif/tests/no-stack-no-heap.post.exp
index 80291568b86b7a6f0e912ff88672f74ea2743c53..553e37ec1b8f8b25bfcd5674660d6802b18901f3 100644 (file)
--- a/massif/tests/no-stack-no-heap.post.exp
+++ b/massif/tests/no-stack-no-heap.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./basic
-Massif arguments:   --stacks=no --heap=no --time-unit=B
+Massif arguments:   --stacks=no --heap=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/no-stack-no-heap.vgtest b/massif/tests/no-stack-no-heap.vgtest
index c07f03c698b6ffd7452c5b6116d7cf8217416172..17308b1e6ab2019f2b6e65802a9c039c88e49b8b 100644 (file)
--- a/massif/tests/no-stack-no-heap.vgtest
+++ b/massif/tests/no-stack-no-heap.vgtest
@@ -1,4 +1,4 @@
 prog: basic
-vgopts: --stacks=no --heap=no --time-unit=B
+vgopts: --stacks=no --heap=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/null.post.exp b/massif/tests/null.post.exp
index e8111de850a3be628510d6747c3399e3268b7d6e..332b2bf5025b2e5783381f4c68b21839cc0d2c72 100644 (file)
--- a/massif/tests/null.post.exp
+++ b/massif/tests/null.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./null
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/null.vgtest b/massif/tests/null.vgtest
index 4e8b80db8216d7e16d82abdf92c019079a320878..72ac65cc22eb4eb0095daab552855fadd8f2d825 100644 (file)
--- a/massif/tests/null.vgtest
+++ b/massif/tests/null.vgtest
@@ -1,4 +1,4 @@
 prog: null
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/one.post.exp b/massif/tests/one.post.exp
index d1657d6454fc25e8f9de71b15156365f564692bf..a57a4f4c8238cafcb70e1725fcd177f6303bf2b8 100644 (file)
--- a/massif/tests/one.post.exp
+++ b/massif/tests/one.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./one
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/one.vgtest b/massif/tests/one.vgtest
index 2d3171de83348c4f8201c95ed99293b896535a99..38e0f7f5f7ce198c88be3b02bb96ca810fc97e4d 100644 (file)
--- a/massif/tests/one.vgtest
+++ b/massif/tests/one.vgtest
@@ -1,4 +1,4 @@
 prog: one
-vgopts: --stacks=no --time-unit=B --heap-admin=0
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/overloaded-new.post.exp b/massif/tests/overloaded-new.post.exp
index b8fd6e7d7ad56cf1b56ce67fbea3b0a7dd0ff0b0..bdabf1d8cf5d96189248c462db12bbf4e31e5a63 100644 (file)
--- a/massif/tests/overloaded-new.post.exp
+++ b/massif/tests/overloaded-new.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./overloaded-new
-Massif arguments:   --stacks=no --time-unit=B
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/overloaded-new.vgtest b/massif/tests/overloaded-new.vgtest
index e12eaae6c9348f1622e27074c0baab2620e096bf..50d2ad03006bd4362d7c6a6f159ad79297f9cdad 100644 (file)
--- a/massif/tests/overloaded-new.vgtest
+++ b/massif/tests/overloaded-new.vgtest
@@ -1,4 +1,4 @@
 prog: overloaded-new
-vgopts: --stacks=no --time-unit=B
+vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/peak.post.exp b/massif/tests/peak.post.exp
index 472f6e78e5904b9c7d46cd0d974e83a2b07cc0c5..d3bd30c9aab380f9e7fa0f2041690cf5c8344872 100644 (file)
--- a/massif/tests/peak.post.exp
+++ b/massif/tests/peak.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./peak
-Massif arguments:   --stacks=no --time-unit=B --peak-inaccuracy=0 --heap-admin=64
+Massif arguments:   --stacks=no --time-unit=B --peak-inaccuracy=0 --heap-admin=64 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/peak.vgtest b/massif/tests/peak.vgtest
index e8327475284b8f16e090a36d26cc6b636069b4ab..d0945ff84acd298ad6f3b9c283e5270c360cd810 100644 (file)
--- a/massif/tests/peak.vgtest
+++ b/massif/tests/peak.vgtest
@@ -1,4 +1,4 @@
 prog: peak
-vgopts: --stacks=no --time-unit=B --peak-inaccuracy=0 --heap-admin=64
+vgopts: --stacks=no --time-unit=B --peak-inaccuracy=0 --heap-admin=64 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/peak2.post.exp b/massif/tests/peak2.post.exp
index 736850cfc12f4dcf978529b60da805eebc612fcb..f40f6f78ba7f360ad8081ae8a92d541d2ee315ad 100644 (file)
--- a/massif/tests/peak2.post.exp
+++ b/massif/tests/peak2.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./peak
-Massif arguments:   --stacks=no --time-unit=B --peak-inaccuracy=10.0 --heap-admin=64
+Massif arguments:   --stacks=no --time-unit=B --peak-inaccuracy=10.0 --heap-admin=64 --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/peak2.vgtest b/massif/tests/peak2.vgtest
index a5b24c52cef803541cb10517ffe6a89676ec3504..4753d02152e4146c9aaf8c1a598d3c851c7cdcd6 100644 (file)
--- a/massif/tests/peak2.vgtest
+++ b/massif/tests/peak2.vgtest
@@ -1,5 +1,5 @@
 prog: peak
-vgopts: --stacks=no --time-unit=B -v -v --peak-inaccuracy=10.0 --heap-admin=64
+vgopts: --stacks=no --time-unit=B -v -v --peak-inaccuracy=10.0 --heap-admin=64 --massif-out-file=massif.out
 stderr_filter: filter_verbose
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/realloc.post.exp b/massif/tests/realloc.post.exp
index 36ce5511d571a5270b5abf393f3b134130689c65..3c14c5b612d039ec2557aad5cb21318f8dcd6658 100644 (file)
--- a/massif/tests/realloc.post.exp
+++ b/massif/tests/realloc.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./realloc
-Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B --threshold=0
+Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B --threshold=0 --massif-out-file=massif.out
 ms_print arguments: --threshold=0 massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/realloc.vgtest b/massif/tests/realloc.vgtest
index 8b7ba7001a827360d0fba90656545764bd8b7db5..c50bad1a510f962d0f7857904777432737acfb80 100644 (file)
--- a/massif/tests/realloc.vgtest
+++ b/massif/tests/realloc.vgtest
@@ -1,5 +1,5 @@
 prog: realloc
-vgopts: -v -v --stacks=no --heap-admin=0 --time-unit=B --threshold=0
+vgopts: -v -v --stacks=no --heap-admin=0 --time-unit=B --threshold=0 --massif-out-file=massif.out
 stderr_filter: filter_verbose
 post: perl ../../massif/ms_print --threshold=0 massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_0_0.post.exp b/massif/tests/thresholds_0_0.post.exp
index 2fd3d63a791f1ff15eb204f39eb175427e28462f..07c444e0871debc8b7df2e2ff28e5d58c9e047da 100644 (file)
--- a/massif/tests/thresholds_0_0.post.exp
+++ b/massif/tests/thresholds_0_0.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=0
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=0 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=0
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_0_0.vgtest b/massif/tests/thresholds_0_0.vgtest
index c6b3dd7da1111ce0edd69d3088fca865113ea37f..5b9f7c685068bd783c767a493b53f81cb2dd5d82 100644 (file)
--- a/massif/tests/thresholds_0_0.vgtest
+++ b/massif/tests/thresholds_0_0.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=0
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=0 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=0 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_0_10.post.exp b/massif/tests/thresholds_0_10.post.exp
index c1f3a487aa872426a155596d11370a4e84959ce0..550aa20db6acff1e4df65230f21f408f6a09315f 100644 (file)
--- a/massif/tests/thresholds_0_10.post.exp
+++ b/massif/tests/thresholds_0_10.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=0
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=0 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=10
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_0_10.vgtest b/massif/tests/thresholds_0_10.vgtest
index 85b82349504f2cb6b96dbbd795f95eec20c3b458..58f2a948236579d9766161cbfdd0cc029f5b5342 100644 (file)
--- a/massif/tests/thresholds_0_10.vgtest
+++ b/massif/tests/thresholds_0_10.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=0
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=0 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=10 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_10_0.post.exp b/massif/tests/thresholds_10_0.post.exp
index bef6f8afc9e5a656033208f8e76b02879206be0f..4ff75317e9d0271b1edc3838862e442c37b89a68 100644 (file)
--- a/massif/tests/thresholds_10_0.post.exp
+++ b/massif/tests/thresholds_10_0.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=10
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=10 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=0
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_10_0.vgtest b/massif/tests/thresholds_10_0.vgtest
index c2b8b43897b110ef8a7315179daee6bb16325edb..8c9dd13ddaaf9848feb846df14b67a3db94d6ca0 100644 (file)
--- a/massif/tests/thresholds_10_0.vgtest
+++ b/massif/tests/thresholds_10_0.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=10
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=10 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=0 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_10_10.post.exp b/massif/tests/thresholds_10_10.post.exp
index 75186076afec36516d81278b9e1adcc9d38736d8..ad56e908ad6984654582aea0e5fa8250c358dcf3 100644 (file)
--- a/massif/tests/thresholds_10_10.post.exp
+++ b/massif/tests/thresholds_10_10.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=10
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=10 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=10
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_10_10.vgtest b/massif/tests/thresholds_10_10.vgtest
index e829b08df5c1829c350200041076598ec2f39d51..0b9083b00af7caecf93ad4c4622159ac3580212e 100644 (file)
--- a/massif/tests/thresholds_10_10.vgtest
+++ b/massif/tests/thresholds_10_10.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=10
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=10 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=10 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_5_0.post.exp b/massif/tests/thresholds_5_0.post.exp
index 6ce9bdec17074a3a4f6d5e9163d498b8db25537d..cb5ee8fa6d2c64653d0663cba336722bc85c80cc 100644 (file)
--- a/massif/tests/thresholds_5_0.post.exp
+++ b/massif/tests/thresholds_5_0.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=5
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=5 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=0
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_5_0.vgtest b/massif/tests/thresholds_5_0.vgtest
index b313c358fbdddd9ddfa9214ce453e85100e3ce3b..cb5f4457b292ecdd3da907cb35deedca5ae32926 100644 (file)
--- a/massif/tests/thresholds_5_0.vgtest
+++ b/massif/tests/thresholds_5_0.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=5
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=5 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=0 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/thresholds_5_10.post.exp b/massif/tests/thresholds_5_10.post.exp
index 5101a4276a965ce5b12bed6887fec1be89a144b6..272e205841b91e667bce288a63da3526c2ee7b45 100644 (file)
--- a/massif/tests/thresholds_5_10.post.exp
+++ b/massif/tests/thresholds_5_10.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./thresholds
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=5
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --threshold=5 --massif-out-file=massif.out
 ms_print arguments: massif.out --threshold=10
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/thresholds_5_10.vgtest b/massif/tests/thresholds_5_10.vgtest
index 615af847e37965c265b9fed4e602e33223dd1471..86a0781032ebb1b0841a3a19cc4cf9dd6c93b22f 100644 (file)
--- a/massif/tests/thresholds_5_10.vgtest
+++ b/massif/tests/thresholds_5_10.vgtest
@@ -1,4 +1,4 @@
 prog: thresholds
-vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=5
+vgopts: --stacks=no --time-unit=B --heap-admin=0 --threshold=5 --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out --threshold=10 | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/zero1.post.exp b/massif/tests/zero1.post.exp
index d27a8628e090f06845046f9c574b42f836ad8dcc..979898272472ecbc562730460ccdb0151a5660e3 100644 (file)
--- a/massif/tests/zero1.post.exp
+++ b/massif/tests/zero1.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./zero
-Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B
+Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B --massif-out-file=massif.out
 ms_print arguments: --threshold=0 massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/zero1.vgtest b/massif/tests/zero1.vgtest
index e32c628c14aac3284b1df217983dcb7592932479..95641db1448058ca35164869672bfc426a5c632d 100644 (file)
--- a/massif/tests/zero1.vgtest
+++ b/massif/tests/zero1.vgtest
@@ -1,4 +1,4 @@
 prog: zero
-vgopts: --stacks=no --heap-admin=0 --time-unit=B
+vgopts: --stacks=no --heap-admin=0 --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print --threshold=0 massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

diff --git a/massif/tests/zero2.post.exp b/massif/tests/zero2.post.exp
index 244c60a92ede16b4b0d4b8ddac595a4656db9fd0..ba2fea8474e2f15e158d09ff6e5593d146559e35 100644 (file)
--- a/massif/tests/zero2.post.exp
+++ b/massif/tests/zero2.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./zero
-Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B
+Massif arguments:   --stacks=no --heap-admin=0 --time-unit=B --massif-out-file=massif.out
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

diff --git a/massif/tests/zero2.vgtest b/massif/tests/zero2.vgtest
index 8cacf37461c750a311aba056f60fb7a5d41af024..0549a5aa68a04a323e22e268fa6c142c954cd84e 100644 (file)
--- a/massif/tests/zero2.vgtest
+++ b/massif/tests/zero2.vgtest
@@ -1,4 +1,4 @@
 prog: zero
-vgopts: --stacks=no --heap-admin=0 --time-unit=B
+vgopts: --stacks=no --heap-admin=0 --time-unit=B --massif-out-file=massif.out
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out