Skip to content

Commit

Permalink
DPORDriver_test: Unconditionally expose typedefs
Browse files Browse the repository at this point in the history
They are also used by TraceDumper, even when
HAVE_BOOST_UNIT_TEST_FRAMEWORK is undefined.
  • Loading branch information
margnus1 committed Mar 26, 2018
1 parent aa5eaaf commit ee83787
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/DPORDriver_test.h
Expand Up @@ -18,7 +18,6 @@
*/

#include <config.h>
#ifdef HAVE_BOOST_UNIT_TEST_FRAMEWORK

#ifndef __DPOR_DRIVER_TEST_H__
#define __DPOR_DRIVER_TEST_H__
Expand All @@ -34,15 +33,6 @@
*/
namespace DPORDriver_test {

/* A configuration with memory_model == TSO (resp. SC, PSO), and
* debug_collect_all_traces == true.
*/
const Configuration &get_tso_conf();
const Configuration &get_sc_conf();
const Configuration &get_pso_conf();
const Configuration &get_power_conf();
const Configuration &get_arm_conf();

/* An IIDOrder object {a,b} should be interpreted as a predicate
* over traces, with the meaning "a precedes b in time".
*/
Expand All @@ -64,6 +54,17 @@ namespace DPORDriver_test {
*/
typedef std::vector<trace_spec> trace_set_spec;

#ifdef HAVE_BOOST_UNIT_TEST_FRAMEWORK

/* A configuration with memory_model == TSO (resp. SC, PSO), and
* debug_collect_all_traces == true.
*/
const Configuration &get_tso_conf();
const Configuration &get_sc_conf();
const Configuration &get_pso_conf();
const Configuration &get_power_conf();
const Configuration &get_arm_conf();

/* Returns true iff t satisfies spec. */
bool check_trace(const Trace &t, const trace_spec &spec);

Expand All @@ -78,7 +79,7 @@ namespace DPORDriver_test {
const trace_set_spec &spec,
const Configuration &conf);

#endif /* defined(HAVE_BOOST_UNIT_TEST_FRAMEWORK) */
}

#endif
#endif

0 comments on commit ee83787

Please sign in to comment.