framework.cc		framework.cc
	skipping to change at line 37		skipping to change at line 37
	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	*		*
	*/		*/
	#include <config.h>		#include "mem_config.h"
	#include <libtest/common.h>		#include <libtest/common.h>
	#include <libtest/collection.h>		#include <libtest/collection.h>
	#include <libtest/signal.h>		#include <libtest/signal.h>
	#include <fnmatch.h>		#include <fnmatch.h>
	#include <iostream>		#include <iostream>
	namespace libtest {		namespace libtest {
	skipping to change at line 121		skipping to change at line 121
	++iter)		++iter)
	{		{
	if (_only_run.empty() == false and		if (_only_run.empty() == false and
	fnmatch(_only_run.c_str(), (*iter)->name(), 0))		fnmatch(_only_run.c_str(), (*iter)->name(), 0))
	{		{
	continue;		continue;
	}		}
	_total++;		_total++;
	try		try {
	{
	switch ((*iter)->exec())		switch ((*iter)->exec())
	{		{
	case TEST_FAILURE:		case TEST_FAILURE:
	_failed++;		_failed++;
	break;		break;
	case TEST_SKIPPED:		case TEST_SKIPPED:
	_skipped++;		_skipped++;
	break;		break;
	skipping to change at line 148		skipping to change at line 147
	}		}
	}		}
	catch (libtest::fatal& e)		catch (libtest::fatal& e)
	{		{
	_failed++;		_failed++;
	stream::cerr(e.file(), e.line(), e.func()) << e.mesg();		stream::cerr(e.file(), e.line(), e.func()) << e.mesg();
	}		}
	catch (libtest::disconnected& e)		catch (libtest::disconnected& e)
	{		{
	_failed++;		_failed++;
	stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnectio n occurred: " << e.mesg();		Error << "Unhandled disconnection occurred:" << e.what();
	throw;		throw;
	}		}
	catch (...)		catch (...)
	{		{
	_failed++;		_failed++;
	throw;		throw;
	}		}
	}		}
	void xml(const std::string& testsuites_name, std::ostream& output);		void xml(const std::string& testsuites_name, std::ostream& output);
End of changes. 3 change blocks.
	4 lines changed or deleted		3 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/