From 3d19c90245a0d7238643c5be10e83816a5a651d4 Mon Sep 17 00:00:00 2001
From: Gabor Buella <gabor.buella@intel.com>
Date: Fri, 13 Apr 2018 19:07:10 +0200
Subject: [PATCH] Test fix - format of optional mmap lines

---
 test/libcintercept0.log.match       | 20 ++++++++++----------
 test/libcintercept0_child.log.match | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/libcintercept0.log.match b/test/libcintercept0.log.match
index d9adc507..d22ccd97 100644
--- a/test/libcintercept0.log.match
+++ b/test/libcintercept0.log.match
@@ -13,18 +13,18 @@ $(OPT)$(S) $(XX) -- openat(AT_FDCWD, $(S), O_RDONLY) = ?
 $(OPT)$(S) $(XX) -- openat(AT_FDCWD, $(S), O_RDONLY) = $(N)
 $(S) $(XX) -- fstat($(N), $(XX)) = ?
 $(S) $(XX) -- fstat($(N), $(XX)) = 0
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
 $(S) $(XX) -- read($(N), $(XX), $(N)) = ?
 $(S) $(XX) -- read($(N), "/*\n * Copyright 2016-2017, Intel Corporation\n *\n * Redistribution and use in source and binary forms, with or without\n...", $(N)) = $(N)
 $(S) $(XX) -- fstat(1, $(XX)) = ?
 $(S) $(XX) -- fstat(1, $(XX)) = 0
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
 $(S) $(XX) -- write(1, "/", 1) = ?
 $(S) $(XX) -- write(1, "/", 1) = 1
 $(S) $(XX) -- write(1, "/*", 2) = ?
@@ -37,5 +37,5 @@ $(S) $(XX) -- write(1, "Done being busy here\n", 21) = ?
 $(S) $(XX) -- write(1, "Done being busy here\n", 21) = 21
 $(S) $(XX) -- close($(N)) = ?
 $(S) $(XX) -- close($(N)) = 0
-$(OPT)$(S) $(XX) -- munmap($(XX), $(N)) = ?
-$(OPT)$(S) $(XX) -- munmap($(XX), $(N)) = 0
+$(OPT)$(S) $(XX) -- munmap($(XX), $(XX)) = ?
+$(OPT)$(S) $(XX) -- munmap($(XX), $(XX)) = 0
diff --git a/test/libcintercept0_child.log.match b/test/libcintercept0_child.log.match
index bcd3f605..fc0688e7 100644
--- a/test/libcintercept0_child.log.match
+++ b/test/libcintercept0_child.log.match
@@ -4,18 +4,18 @@ $(OPT)$(S) $(XX) -- openat(AT_FDCWD, $(S), O_RDONLY) = ?
 $(OPT)$(S) $(XX) -- openat(AT_FDCWD, $(S), O_RDONLY) = $(N)
 $(S) $(XX) -- fstat($(N), $(XX)) = ?
 $(S) $(XX) -- fstat($(N), $(XX)) = 0
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
 $(S) $(XX) -- read($(N), $(XX), $(N)) = ?
 $(S) $(XX) -- read($(N), "/*\n * Copyright 2016-2017, Intel Corporation\n *\n * Redistribution and use in source and binary forms, with or without\n...", $(N)) = $(N)
 $(S) $(XX) -- fstat(1, $(XX)) = ?
 $(S) $(XX) -- fstat(1, $(XX)) = 0
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = ?
-$(OPT)$(S) $(XX) -- mmap($(XX), $(N), $(N), $(N), $(N), $(XX)) = $(N)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = ?
+$(OPT)$(S) $(XX) -- mmap((null), $(XX), $(XX), $(XX), $(N), $(XX)) = $(XX)
 $(S) $(XX) -- write(1, "/", 1) = ?
 $(S) $(XX) -- write(1, "/", 1) = 1
 $(S) $(XX) -- write(1, "/*", 2) = ?
@@ -28,5 +28,5 @@ $(S) $(XX) -- write(1, "Done being busy here\n", 21) = ?
 $(S) $(XX) -- write(1, "Done being busy here\n", 21) = 21
 $(S) $(XX) -- close($(N)) = ?
 $(S) $(XX) -- close($(N)) = 0
-$(OPT)$(S) $(XX) -- munmap($(XX), $(N)) = ?
-$(OPT)$(S) $(XX) -- munmap($(XX), $(N)) = 0
+$(OPT)$(S) $(XX) -- munmap($(XX), $(XX)) = ?
+$(OPT)$(S) $(XX) -- munmap($(XX), $(XX)) = 0