test_tbb_version.cpp   test_tbb_version.cpp 
/* /*
Copyright 2005-2012 Intel Corporation. All Rights Reserved. Copyright 2005-2013 Intel Corporation. All Rights Reserved.
This file is part of Threading Building Blocks. This file is part of Threading Building Blocks.
Threading Building Blocks is free software; you can redistribute it Threading Building Blocks is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License and/or modify it under the terms of the GNU General Public License
version 2 as published by the Free Software Foundation. version 2 as published by the Free Software Foundation.
Threading Building Blocks is distributed in the hope that it will be Threading Building Blocks is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
skipping to change at line 32 skipping to change at line 32
this file and link it with other files to produce an executable, this this file and link it with other files to produce an executable, this
file does not by itself cause the resulting executable to be covered by file does not by itself cause the resulting executable to be covered by
the GNU General Public License. This exception does not however the GNU General Public License. This exception does not however
invalidate any other reasons why the executable file might be covered b y invalidate any other reasons why the executable file might be covered b y
the GNU General Public License. the GNU General Public License.
*/ */
#include "tbb/tbb_stddef.h" #include "tbb/tbb_stddef.h"
#if __TBB_WIN8UI_SUPPORT #if __TBB_WIN8UI_SUPPORT
// TODO: figure out how the test can be enabled for Metro // TODO: figure out how the test can be enabled for win8ui
#define HARNESS_NO_PARSE_COMMAND_LINE 1 #define HARNESS_NO_PARSE_COMMAND_LINE 1
#include "harness.h" #include "harness.h"
int TestMain() { int TestMain() {
return Harness::Skipped; return Harness::Skipped;
} }
#else #else
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
skipping to change at line 248 skipping to change at line 248
REPORT("done\n"); REPORT("done\n");
#endif //__TBB_MPI_INTEROP #endif //__TBB_MPI_INTEROP
#endif //__TBB_MIC #endif //__TBB_MIC
return 0; return 0;
} }
// Fill dictionary with version strings for platforms // Fill dictionary with version strings for platforms
void initialize_strings_vector(std::vector <string_pair>* vector) void initialize_strings_vector(std::vector <string_pair>* vector)
{ {
vector->push_back(string_pair("TBB: VERSION\t\t4.1", required)); // check TBB_VERSION vector->push_back(string_pair("TBB: VERSION\t\t4.1", required)); // check TBB_VERSION
vector->push_back(string_pair("TBB: INTERFACE VERSION\t6101", required) ); // check TBB_INTERFACE_VERSION vector->push_back(string_pair("TBB: INTERFACE VERSION\t6102", required) ); // check TBB_INTERFACE_VERSION
vector->push_back(string_pair("TBB: BUILD_DATE", required)); vector->push_back(string_pair("TBB: BUILD_DATE", required));
vector->push_back(string_pair("TBB: BUILD_HOST", required)); vector->push_back(string_pair("TBB: BUILD_HOST", required));
vector->push_back(string_pair("TBB: BUILD_OS", required)); vector->push_back(string_pair("TBB: BUILD_OS", required));
#if _WIN32||_WIN64 #if _WIN32||_WIN64
#if !__MINGW32__ #if !__MINGW32__
vector->push_back(string_pair("TBB: BUILD_CL", required)); vector->push_back(string_pair("TBB: BUILD_CL", required));
#endif #endif
vector->push_back(string_pair("TBB: BUILD_COMPILER", required)); vector->push_back(string_pair("TBB: BUILD_COMPILER", required));
#elif __APPLE__ #elif __APPLE__
vector->push_back(string_pair("TBB: BUILD_KERNEL", required)); vector->push_back(string_pair("TBB: BUILD_KERNEL", required));
 End of changes. 3 change blocks. 
3 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/