Skip to content

avoid ch ENABLE_TEST_HOOKS def side effect #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chakrabot merged 1 commit into from
Jul 28, 2016
Merged

avoid ch ENABLE_TEST_HOOKS def side effect #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bin/ch/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#define WIN32_LEAN_AND_MEAN 1

#define ENABLE_TEST_HOOKS 1
#include "CommonDefines.h"
#include <map>
#include <string>
Expand Down Expand Up @@ -137,6 +136,9 @@ do { \
} \
} while (0)

#ifndef ENABLE_TEST_HOOKS
#define ENABLE_TEST_HOOKS
#endif
#include "TestHooks.h"
#include "ChakraRtInterface.h"
#include "HostConfigFlags.h"
Expand Down
4 changes: 1 addition & 3 deletions lib/Common/CommonDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#ifdef ENABLE_TEST_HOOKS
#ifndef ENABLE_DEBUG_CONFIG_OPTIONS
#define ENABLE_DEBUG_CONFIG_OPTIONS 1
#define DEBUG_CONFIG_OPTIONS_WERE_DISABLED
#endif
#endif

Expand Down Expand Up @@ -313,10 +312,9 @@
#define ENABLE_TEST_HOOKS
#endif

#if !defined(DEBUG_CONFIG_OPTIONS_WERE_DISABLED) || defined(DEBUG)
////////
//Time Travel flags
#define ENABLE_TTD 1
#endif

#if ENABLE_TTD
//Enable debugging specific aspects of TTD
Expand Down