Merge pull request #78 from GBuella/syscall_format_fix

Syscall format test fix
pmem · Apr 9, 2018 · a744b72 · a744b72
2 parents ef0cbce + e85b98a
commit a744b72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -329,6 +329,6 @@ add_test(NAME "syscall_format_logging"
  -DTEST_EXTRA_PRELOAD=${TEST_EXTRA_PRELOAD}
  -DTEST_PROG=$<TARGET_FILE:syscall_format>
  -DLIB_FILE=
- -DMATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/libcintercept3.log.match
+ -DMATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/syscall_format.log.match
  -DTEST_NAME=syscall_format_logging
  ${CHECK_LOG_COMMON_ARGS})
diff --git a/test/libcintercept3.log.match → test/syscall_format.log.match b/test/libcintercept3.log.match → test/syscall_format.log.match
@@ -170,8 +170,8 @@ $(S) $(XX) -- madvise((null), 0, 2) = ?
 $(S) $(XX) -- madvise((null), 0, 2) = 22
 $(S) $(XX) -- mlock(0x123000, 0x3000) = ?
 $(S) $(XX) -- mlock(0x123000, 0x3000) = 22
-$(S) $(XX) -- mlock2(0x123000, 0x3000, 0x0) = ?
-$(S) $(XX) -- mlock2(0x123000, 0x3000, 0x0) = 22
+$(OPT)$(S) $(XX) -- mlock2(0x123000, 0x3000, 0x0) = ?
+$(OPT)$(S) $(XX) -- mlock2(0x123000, 0x3000, 0x0) = 22
 $(S) $(XX) -- munlock(0x123000, 0x3000) = ?
 $(S) $(XX) -- munlock(0x123000, 0x3000) = 22
 $(S) $(XX) -- mlockall(0x1) = ?
@@ -696,8 +696,8 @@ $(S) $(XX) -- mq_getsetattr(0x1, 0x123000, 0x234000) = ?
 $(S) $(XX) -- mq_getsetattr(0x1, 0x123000, 0x234000) = 22
 $(S) $(XX) -- kexec_load(0x1, 0x2, 0x123000, 0x2) = ?
 $(S) $(XX) -- kexec_load(0x1, 0x2, 0x123000, 0x2) = 22
-$(S) $(XX) -- kexec_file_load(0x1, 0x2, 0x3, $(XX), 0x2) = ?
-$(S) $(XX) -- kexec_file_load(0x1, 0x2, 0x3, $(XX), 0x2) = 22
+$(OPT)$(S) $(XX) -- kexec_file_load(0x1, 0x2, 0x3, $(XX), 0x2) = ?
+$(OPT)$(S) $(XX) -- kexec_file_load(0x1, 0x2, 0x3, $(XX), 0x2) = 22
 $(S) $(XX) -- waitid(0x1, 0x2, 0x123000, 0x4) = ?
 $(S) $(XX) -- waitid(0x1, 0x2, 0x123000, 0x4) = 22
 $(S) $(XX) -- add_key(0x123000, 0x234000, 0x123000, 0x234000, 0x1) = ?