From 4f0814ce42184cb1c4530e5f38a428796423e196 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sat, 29 Nov 2014 13:28:34 -0800 Subject: [PATCH] Remove unstable __FILE__ output from vmtrace logging --- src/glue.h | 4 ++-- src/test/testvm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/glue.h b/src/glue.h index 932cca01..d4c30963 100644 --- a/src/glue.h +++ b/src/glue.h @@ -29,7 +29,7 @@ c__##func(ea, b); \ extern FILE *test_vm_fp; \ if (test_vm_fp && !vm_trace_is_ignored(ea)) { \ - fprintf(test_vm_fp, "%04X w:%02X %s (%s:%d)\n", ea, b, __FUNCTION__, __FILE__, __LINE__); \ + fprintf(test_vm_fp, "%04X w:%02X %s\n", ea, b, __FUNCTION__); \ fflush(test_vm_fp); \ } \ } \ @@ -41,7 +41,7 @@ uint8_t b = c__##func(ea); \ extern FILE *test_vm_fp; \ if (test_vm_fp && !vm_trace_is_ignored(ea)) { \ - fprintf(test_vm_fp, "%04X r:%02X %s (%s:%d)\n", ea, b, __FUNCTION__, __FILE__, __LINE__); \ + fprintf(test_vm_fp, "%04X r:%02X %s\n", ea, b, __FUNCTION__); \ fflush(test_vm_fp); \ } \ return b; \ diff --git a/src/test/testvm.c b/src/test/testvm.c index ea0a6f0b..8172077e 100644 --- a/src/test/testvm.c +++ b/src/test/testvm.c @@ -144,8 +144,8 @@ TEST test_boot_disk_cputrace() { PASS(); } -#define EXPECTED_VM_TRACE_FILE_SIZE 3688453 -#define EXPECTED_VM_TRACE_SHA "935DDADC7ED1F07A18A41DC5465C61B4078E6B09" +#define EXPECTED_VM_TRACE_FILE_SIZE 2352827 +#define EXPECTED_VM_TRACE_SHA "D137B7D312A66F4F19E5846D1BBC56C2A53A8C3F" TEST test_boot_disk_vmtrace() { char *homedir = getenv("HOME"); char *disk = NULL;