From: Mark Wielaard <mark@klomp.org>
Date: Sun, 28 Feb 2016 10:37:55 +0000 (+0000)
Subject: Fix memcheck/tests/memalign_test expected output.
X-Git-Tag: svn/VALGRIND_3_12_0~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c751d21efdb88d26451add24cb5e91f8d668576;p=thirdparty%2Fvalgrind.git

Fix memcheck/tests/memalign_test expected output.

r15815 "Allow 8k and 32k page sizes" added an extra line in memalign_test.c.
This changed the line numbers in the output compared to the .exp file.
Just put everything on one (long) line to match expectations again.

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

diff --git a/memcheck/tests/memalign_test.c b/memcheck/tests/memalign_test.c
index e649462804..f7fd8554f2 100644
--- a/memcheck/tests/memalign_test.c
+++ b/memcheck/tests/memalign_test.c
@@ -10,8 +10,7 @@ int main ( void )
   int i;
   unsigned long pszB = sysconf(_SC_PAGE_SIZE);
   assert(sizeof(long) == sizeof(void*));
-  assert(pszB == 4096 || pszB == 8192 || pszB == 16384 || pszB == 32768
-         || pszB == 65536);
+  assert(pszB == 4096 || pszB == 8192 || pszB == 16384 || pszB == 32768 || pszB == 65536); /* All on one line to match linenumbers in the .exp file. */
 
   for (i = 0; i < 10; i++) {
     a[i] = valloc(11111 * (i+1));