mirror of https://github.com/catchorg/Catch2.git
Catches incorrect reporter name as per #107
This commit is contained in:
parent
b084562b3b
commit
61756974d0
|
@ -36,6 +36,12 @@ namespace Catch {
|
|||
|
||||
Ptr<IReporter> reporter = getCurrentContext().getReporterRegistry().create( reporterName, reporterConfig );
|
||||
|
||||
if( !reporter )
|
||||
{
|
||||
std::cerr << "No reporter registered with name: " << reporterName << "'" << std::endl;
|
||||
return (std::numeric_limits<int>::max)();
|
||||
}
|
||||
|
||||
if( !config.data().stream.empty() ) {
|
||||
if( config.data().stream[0] == '%' )
|
||||
config.useStream( config.data().stream.substr( 1 ) );
|
||||
|
|
|
@ -20,10 +20,12 @@ namespace Catch {
|
|||
public:
|
||||
Ptr() : m_p( NULL ){}
|
||||
Ptr( T* p ) : m_p( p ){
|
||||
m_p->addRef();
|
||||
if( m_p )
|
||||
m_p->addRef();
|
||||
}
|
||||
Ptr( const Ptr& other ) : m_p( other.m_p ){
|
||||
m_p->addRef();
|
||||
if( m_p )
|
||||
m_p->addRef();
|
||||
}
|
||||
~Ptr(){
|
||||
if( m_p )
|
||||
|
@ -63,6 +65,9 @@ namespace Catch {
|
|||
const T* operator->() const{
|
||||
return m_p;
|
||||
}
|
||||
bool operator !() const {
|
||||
return m_p == NULL;
|
||||
}
|
||||
|
||||
private:
|
||||
T* m_p;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Generated: 2012-07-28 20:22:25.519628
|
||||
* Generated: 2012-07-28 20:36:23.213113
|
||||
* ----------------------------------------------------------
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
|
@ -196,10 +196,12 @@ namespace Catch {
|
|||
public:
|
||||
Ptr() : m_p( NULL ){}
|
||||
Ptr( T* p ) : m_p( p ){
|
||||
m_p->addRef();
|
||||
if( m_p )
|
||||
m_p->addRef();
|
||||
}
|
||||
Ptr( const Ptr& other ) : m_p( other.m_p ){
|
||||
m_p->addRef();
|
||||
if( m_p )
|
||||
m_p->addRef();
|
||||
}
|
||||
~Ptr(){
|
||||
if( m_p )
|
||||
|
@ -239,6 +241,9 @@ namespace Catch {
|
|||
const T* operator->() const{
|
||||
return m_p;
|
||||
}
|
||||
bool operator !() const {
|
||||
return m_p == NULL;
|
||||
}
|
||||
|
||||
private:
|
||||
T* m_p;
|
||||
|
@ -4616,6 +4621,12 @@ namespace Catch {
|
|||
|
||||
Ptr<IReporter> reporter = getCurrentContext().getReporterRegistry().create( reporterName, reporterConfig );
|
||||
|
||||
if( !reporter )
|
||||
{
|
||||
std::cerr << "No reporter registered with name: " << reporterName << "'" << std::endl;
|
||||
return (std::numeric_limits<int>::max)();
|
||||
}
|
||||
|
||||
if( !config.data().stream.empty() ) {
|
||||
if( config.data().stream[0] == '%' )
|
||||
config.useStream( config.data().stream.substr( 1 ) );
|
||||
|
|
Loading…
Reference in New Issue