From a44168e927da8d9106c559aab0f842c823ae1a65 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Fri, 18 Dec 2009 16:48:20 +0000 Subject: Moves gtest.def from src/ to msvc/. git-svn-id: http://googletest.googlecode.com/svn/trunk@355 861a406c-534a-0410-8894-cb66d6ee9925 --- msvc/gtest.def | 123 ++++++++++++++++++++++++++++++++++++++++++ scons/SConscript | 2 +- scripts/generate_gtest_def.py | 6 +-- src/gtest.def | 123 ------------------------------------------ 4 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 msvc/gtest.def delete mode 100644 src/gtest.def diff --git a/msvc/gtest.def b/msvc/gtest.def new file mode 100644 index 0000000..a5583df --- /dev/null +++ b/msvc/gtest.def @@ -0,0 +1,123 @@ +; This file is auto-generated. DO NOT EDIT DIRECTLY. +; For more information, see scripts/generate_gtest_def.py. + +LIBRARY + +EXPORTS + ??0AssertHelper@internal@testing@@QAE@W4Type@TestPartResult@2@PBDH1@Z + ??0AssertionResult@testing@@QAE@ABV01@@Z + ??0ExitedWithCode@testing@@QAE@H@Z + ??0GTestLog@internal@testing@@QAE@W4GTestLogSeverity@12@PBDH@Z + ??0HasNewFatalFailureHelper@internal@testing@@QAE@XZ + ??0ScopedFakeTestPartResultReporter@testing@@QAE@W4InterceptMode@01@PAVTestPartResultArray@1@@Z + ??0ScopedTrace@internal@testing@@QAE@PBDHABVMessage@2@@Z + ??0SingleFailureChecker@internal@testing@@QAE@PBVTestPartResultArray@2@W4Type@TestPartResult@2@PBD@Z + ??0Test@testing@@IAE@XZ + ??0TestPartResultArray@testing@@QAE@XZ + ??1AssertHelper@internal@testing@@QAE@XZ + ??1GTestLog@internal@testing@@QAE@XZ + ??1HasNewFatalFailureHelper@internal@testing@@UAE@XZ + ??1RE@internal@testing@@QAE@XZ + ??1ScopedFakeTestPartResultReporter@testing@@UAE@XZ + ??1ScopedTrace@internal@testing@@QAE@XZ + ??1SingleFailureChecker@internal@testing@@QAE@XZ + ??1Test@testing@@UAE@XZ + ??1TestPartResultArray@testing@@QAE@XZ + ??4AssertHelper@internal@testing@@QBEXABVMessage@2@@Z + ??6Message@testing@@QAEAAV01@ABV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@Z + ??7AssertionResult@testing@@QBE?AV01@XZ + ??RExitedWithCode@testing@@QBE_NH@Z + ?AddEnvironment@UnitTest@testing@@AAEPAVEnvironment@2@PAV32@@Z + ?AlwaysTrue@internal@testing@@YA_NXZ + ?Append@TestEventListeners@testing@@QAEXPAVTestEventListener@2@@Z + ?AssertionFailure@testing@@YA?AVAssertionResult@1@ABVMessage@1@@Z + ?AssertionFailure@testing@@YA?AVAssertionResult@1@XZ + ?AssertionSuccess@testing@@YA?AVAssertionResult@1@XZ + ?CmpHelperSTRCASEEQ@internal@testing@@YA?AVAssertionResult@2@PBD000@Z + ?CmpHelperSTRCASENE@internal@testing@@YA?AVAssertionResult@2@PBD000@Z + ?CmpHelperSTREQ@internal@testing@@YA?AVAssertionResult@2@PBD000@Z + ?CmpHelperSTREQ@internal@testing@@YA?AVAssertionResult@2@PBD0PB_W1@Z + ?CmpHelperSTRNE@internal@testing@@YA?AVAssertionResult@2@PBD000@Z + ?CmpHelperSTRNE@internal@testing@@YA?AVAssertionResult@2@PBD0PB_W1@Z + ?Compare@String@internal@testing@@QBEHABV123@@Z + ?Create@DeathTest@internal@testing@@SA_NPBDPBVRE@23@0HPAPAV123@@Z + ?DoubleLE@testing@@YA?AVAssertionResult@1@PBD0NN@Z + ?DoubleNearPredFormat@internal@testing@@YA?AVAssertionResult@2@PBD00NNN@Z + ?EqFailure@internal@testing@@YA?AVAssertionResult@2@PBD0ABVString@12@1_N@Z + ?ExitedUnsuccessfully@internal@testing@@YA_NH@Z + ?FLAGS_gtest_also_run_disabled_tests@testing@@3_NA + ?FLAGS_gtest_break_on_failure@testing@@3_NA + ?FLAGS_gtest_catch_exceptions@testing@@3_NA + ?FLAGS_gtest_color@testing@@3VString@internal@1@A + ?FLAGS_gtest_filter@testing@@3VString@internal@1@A + ?FLAGS_gtest_output@testing@@3VString@internal@1@A + ?FLAGS_gtest_print_time@testing@@3_NA + ?FLAGS_gtest_random_seed@testing@@3HA + ?FLAGS_gtest_repeat@testing@@3HA + ?FLAGS_gtest_shuffle@testing@@3_NA + ?FLAGS_gtest_stack_trace_depth@testing@@3HA + ?FLAGS_gtest_throw_on_failure@testing@@3_NA + ?Failed@TestResult@testing@@QBE_NXZ + ?Failed@UnitTest@testing@@QBE_NXZ + ?FloatLE@testing@@YA?AVAssertionResult@1@PBD0MM@Z + ?Format@String@internal@testing@@SA?AV123@PBDZZ + ?FormatForFailureMessage@internal@testing@@YA?AVString@12@D@Z + ?GetBoolAssertionFailureMessage@internal@testing@@YA?AVString@12@ABVAssertionResult@2@PBD11@Z + ?GetInstance@UnitTest@testing@@SAPAV12@XZ + ?GetTestCase@UnitTest@testing@@QBEPBVTestCase@2@H@Z + ?GetTestInfo@TestCase@testing@@QBEPBVTestInfo@2@H@Z + ?GetTestPartResult@TestResult@testing@@QBEABVTestPartResult@2@H@Z + ?GetTestProperty@TestResult@testing@@QBEABVTestProperty@2@H@Z + ?GetTestTypeId@internal@testing@@YAPBXXZ + ?HasFatalFailure@Test@testing@@SA_NXZ + ?HasFatalFailure@TestResult@testing@@QBE_NXZ + ?HasNonfatalFailure@Test@testing@@SA_NXZ + ?HasNonfatalFailure@TestResult@testing@@QBE_NXZ + ?Init@RE@internal@testing@@AAEXPBD@Z + ?InitGoogleTest@testing@@YAXPAHPAPAD@Z + ?IsHRESULTFailure@internal@testing@@YA?AVAssertionResult@2@PBDJ@Z + ?IsHRESULTSuccess@internal@testing@@YA?AVAssertionResult@2@PBDJ@Z + ?IsTrue@internal@testing@@YA_N_N@Z + ?LastMessage@DeathTest@internal@testing@@SAPBDXZ + ?MakeAndRegisterTestInfo@internal@testing@@YAPAVTestInfo@2@PBD000PBXP6AXXZ2PAVTestFactoryBase@12@@Z + ?Passed@UnitTest@testing@@QBE_NXZ + ?RecordProperty@Test@testing@@SAXPBD0@Z + ?Release@TestEventListeners@testing@@QAEPAVTestEventListener@2@PAV32@@Z + ?ReportInvalidTestCaseType@internal@testing@@YAXPBD0H@Z + ?Run@UnitTest@testing@@QAEHXZ + ?SetUp@Test@testing@@MAEXXZ + ?ShowCStringQuoted@String@internal@testing@@SA?AV123@PBD@Z + ?ShowWideCStringQuoted@String@internal@testing@@SA?AV123@PB_W@Z + ?StrStreamToString@internal@testing@@YA?AVString@12@PAV?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + ?TearDown@Test@testing@@MAEXXZ + ?VerifyRegisteredTestNames@TypedTestCasePState@internal@testing@@QAEPBDPBDH0@Z + ?comment@TestInfo@testing@@QBEPBDXZ + ?current_test_case@UnitTest@testing@@QBEPBVTestCase@2@XZ + ?current_test_info@UnitTest@testing@@QBEPBVTestInfo@2@XZ + ?disabled_test_count@TestCase@testing@@QBEHXZ + ?disabled_test_count@UnitTest@testing@@QBEHXZ + ?elapsed_time@UnitTest@testing@@QBE_JXZ + ?failed_test_case_count@UnitTest@testing@@QBEHXZ + ?failed_test_count@TestCase@testing@@QBEHXZ + ?failed_test_count@UnitTest@testing@@QBEHXZ + ?g_linked_ptr_mutex@internal@testing@@3VMutex@12@A + ?listeners@UnitTest@testing@@QAEAAVTestEventListeners@2@XZ + ?name@TestInfo@testing@@QBEPBDXZ + ?original_working_dir@UnitTest@testing@@QBEPBDXZ + ?parameterized_test_registry@UnitTest@testing@@QAEAAVParameterizedTestCaseRegistry@internal@2@XZ + ?random_seed@UnitTest@testing@@QBEHXZ + ?result@TestInfo@testing@@QBEPBVTestResult@2@XZ + ?should_run@TestInfo@testing@@QBE_NXZ + ?successful_test_case_count@UnitTest@testing@@QBEHXZ + ?successful_test_count@TestCase@testing@@QBEHXZ + ?successful_test_count@UnitTest@testing@@QBEHXZ + ?test_case_comment@TestInfo@testing@@QBEPBDXZ + ?test_case_name@TestInfo@testing@@QBEPBDXZ + ?test_case_to_run_count@UnitTest@testing@@QBEHXZ + ?test_property_count@TestResult@testing@@QBEHXZ + ?test_to_run_count@TestCase@testing@@QBEHXZ + ?test_to_run_count@UnitTest@testing@@QBEHXZ + ?total_part_count@TestResult@testing@@QBEHXZ + ?total_test_case_count@UnitTest@testing@@QBEHXZ + ?total_test_count@TestCase@testing@@QBEHXZ + ?total_test_count@UnitTest@testing@@QBEHXZ diff --git a/scons/SConscript b/scons/SConscript index a2c31dc..df1392e 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -298,7 +298,7 @@ if BUILD_TESTS: if env['PLATFORM'] == 'win32' and env.get('GTEST_BUILD_DLL_TEST', None): test_env = EnvCreator.Create(env, EnvCreator.DllBuild) dll_env = test_env.Clone() - dll_env.Append(LINKFLAGS=['-DEF:../src/gtest.def']) + dll_env.Append(LINKFLAGS=['-DEF:../msvc/gtest.def']) gtest_dll = dll_env.SharedLibrary( target='gtest_dll', diff --git a/scripts/generate_gtest_def.py b/scripts/generate_gtest_def.py index 9de7038..048ef59 100755 --- a/scripts/generate_gtest_def.py +++ b/scripts/generate_gtest_def.py @@ -63,7 +63,7 @@ import sys # We assume that this file is in the scripts/ directory in the Google # Test root directory. -GTEST_DEF_PATH = os.path.join(os.path.dirname(__file__), '../src/gtest.def') +GTEST_DEF_PATH = os.path.join(os.path.dirname(__file__), '../msvc/gtest.def') # Locates the header of the EXPORTS section. EXPORTS_SECTION_REGEX = re.compile(r'^EXPORTS\s*$', re.IGNORECASE) @@ -156,13 +156,13 @@ def main(): exports = AdjustExports(exports, unresolved) WriteGtestDefFile(open(GTEST_DEF_PATH, 'w'), exports) - sys.stderr.write('Updated test/gtest.def. Please clean the .dll file\n' + sys.stderr.write('Updated gtest.def. Please clean the .dll file\n' 'produced by your Google Test DLL build, run the build\n' 'again and pass its diagnostic output to this script\n' 'unless the build succeeds.\n') else: sys.stderr.write('The build diagnostic output indicates no unresolved\n' - 'externals. test/gtest.def is likely up to date and\n' + 'externals. gtest.def is likely up to date and\n' 'has not been updated.\n') if __name__ == '__main__': diff --git a/src/gtest.def b/src/gtest.def deleted file mode 100644 index a5583df..0000000 --- a/src/gtest.def +++ /dev/null @@ -1,123 +0,0 @@ -; This file is auto-generated. DO NOT EDIT DIRECTLY. -; For more information, see scripts/generate_gtest_def.py. - -LIBRARY - -EXPORTS - ??0AssertHelper@internal@testing@@QAE@W4Type@TestPartResult@2@PBDH1@Z - ??0AssertionResult@testing@@QAE@ABV01@@Z - ??0ExitedWithCode@testing@@QAE@H@Z - ??0GTestLog@internal@testing@@QAE@W4GTestLogSeverity@12@PBDH@Z - ??0HasNewFatalFailureHelper@internal@testing@@QAE@XZ - ??0ScopedFakeTestPartResultReporter@testing@@QAE@W4InterceptMode@01@PAVTestPartResultArray@1@@Z - ??0ScopedTrace@internal@testing@@QAE@PBDHABVMessage@2@@Z - ??0SingleFailureChecker@internal@testing@@QAE@PBVTestPartResultArray@2@W4Type@TestPartResult@2@PBD@Z - ??0Test@testing@@IAE@XZ - ??0TestPartResultArray@testing@@QAE@XZ - ??1AssertHelper@internal@testing@@QAE@XZ - ??1GTestLog@internal@testing@@QAE@XZ - ??1HasNewFatalFailureHelper@internal@testing@@UAE@XZ - ??1RE@internal@testing@@QAE@XZ - ??1ScopedFakeTestPartResultReporter@testing@@UAE@XZ - ??1ScopedTrace@internal@testing@@QAE@XZ - ??1SingleFailureChecker@internal@testing@@QAE@XZ - ??1Test@testing@@UAE@XZ - ??1TestPartResultArray@testing@@QAE@XZ - ??4AssertHelper@internal@testing@@QBEXABVMessage@2@@Z - ??6Message@testing@@QAEAAV01@ABV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@Z - ??7AssertionResult@testing@@QBE?AV01@XZ - ??RExitedWithCode@testing@@QBE_NH@Z - ?AddEnvironment@UnitTest@testing@@AAEPAVEnvironment@2@PAV32@@Z - ?AlwaysTrue@internal@testing@@YA_NXZ - ?Append@TestEventListeners@testing@@QAEXPAVTestEventListener@2@@Z - ?AssertionFailure@testing@@YA?AVAssertionResult@1@ABVMessage@1@@Z - ?AssertionFailure@testing@@YA?AVAssertionResult@1@XZ - ?AssertionSuccess@testing@@YA?AVAssertionResult@1@XZ - ?CmpHelperSTRCASEEQ@internal@testing@@YA?AVAssertionResult@2@PBD000@Z - ?CmpHelperSTRCASENE@internal@testing@@YA?AVAssertionResult@2@PBD000@Z - ?CmpHelperSTREQ@internal@testing@@YA?AVAssertionResult@2@PBD000@Z - ?CmpHelperSTREQ@internal@testing@@YA?AVAssertionResult@2@PBD0PB_W1@Z - ?CmpHelperSTRNE@internal@testing@@YA?AVAssertionResult@2@PBD000@Z - ?CmpHelperSTRNE@internal@testing@@YA?AVAssertionResult@2@PBD0PB_W1@Z - ?Compare@String@internal@testing@@QBEHABV123@@Z - ?Create@DeathTest@internal@testing@@SA_NPBDPBVRE@23@0HPAPAV123@@Z - ?DoubleLE@testing@@YA?AVAssertionResult@1@PBD0NN@Z - ?DoubleNearPredFormat@internal@testing@@YA?AVAssertionResult@2@PBD00NNN@Z - ?EqFailure@internal@testing@@YA?AVAssertionResult@2@PBD0ABVString@12@1_N@Z - ?ExitedUnsuccessfully@internal@testing@@YA_NH@Z - ?FLAGS_gtest_also_run_disabled_tests@testing@@3_NA - ?FLAGS_gtest_break_on_failure@testing@@3_NA - ?FLAGS_gtest_catch_exceptions@testing@@3_NA - ?FLAGS_gtest_color@testing@@3VString@internal@1@A - ?FLAGS_gtest_filter@testing@@3VString@internal@1@A - ?FLAGS_gtest_output@testing@@3VString@internal@1@A - ?FLAGS_gtest_print_time@testing@@3_NA - ?FLAGS_gtest_random_seed@testing@@3HA - ?FLAGS_gtest_repeat@testing@@3HA - ?FLAGS_gtest_shuffle@testing@@3_NA - ?FLAGS_gtest_stack_trace_depth@testing@@3HA - ?FLAGS_gtest_throw_on_failure@testing@@3_NA - ?Failed@TestResult@testing@@QBE_NXZ - ?Failed@UnitTest@testing@@QBE_NXZ - ?FloatLE@testing@@YA?AVAssertionResult@1@PBD0MM@Z - ?Format@String@internal@testing@@SA?AV123@PBDZZ - ?FormatForFailureMessage@internal@testing@@YA?AVString@12@D@Z - ?GetBoolAssertionFailureMessage@internal@testing@@YA?AVString@12@ABVAssertionResult@2@PBD11@Z - ?GetInstance@UnitTest@testing@@SAPAV12@XZ - ?GetTestCase@UnitTest@testing@@QBEPBVTestCase@2@H@Z - ?GetTestInfo@TestCase@testing@@QBEPBVTestInfo@2@H@Z - ?GetTestPartResult@TestResult@testing@@QBEABVTestPartResult@2@H@Z - ?GetTestProperty@TestResult@testing@@QBEABVTestProperty@2@H@Z - ?GetTestTypeId@internal@testing@@YAPBXXZ - ?HasFatalFailure@Test@testing@@SA_NXZ - ?HasFatalFailure@TestResult@testing@@QBE_NXZ - ?HasNonfatalFailure@Test@testing@@SA_NXZ - ?HasNonfatalFailure@TestResult@testing@@QBE_NXZ - ?Init@RE@internal@testing@@AAEXPBD@Z - ?InitGoogleTest@testing@@YAXPAHPAPAD@Z - ?IsHRESULTFailure@internal@testing@@YA?AVAssertionResult@2@PBDJ@Z - ?IsHRESULTSuccess@internal@testing@@YA?AVAssertionResult@2@PBDJ@Z - ?IsTrue@internal@testing@@YA_N_N@Z - ?LastMessage@DeathTest@internal@testing@@SAPBDXZ - ?MakeAndRegisterTestInfo@internal@testing@@YAPAVTestInfo@2@PBD000PBXP6AXXZ2PAVTestFactoryBase@12@@Z - ?Passed@UnitTest@testing@@QBE_NXZ - ?RecordProperty@Test@testing@@SAXPBD0@Z - ?Release@TestEventListeners@testing@@QAEPAVTestEventListener@2@PAV32@@Z - ?ReportInvalidTestCaseType@internal@testing@@YAXPBD0H@Z - ?Run@UnitTest@testing@@QAEHXZ - ?SetUp@Test@testing@@MAEXXZ - ?ShowCStringQuoted@String@internal@testing@@SA?AV123@PBD@Z - ?ShowWideCStringQuoted@String@internal@testing@@SA?AV123@PB_W@Z - ?StrStreamToString@internal@testing@@YA?AVString@12@PAV?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - ?TearDown@Test@testing@@MAEXXZ - ?VerifyRegisteredTestNames@TypedTestCasePState@internal@testing@@QAEPBDPBDH0@Z - ?comment@TestInfo@testing@@QBEPBDXZ - ?current_test_case@UnitTest@testing@@QBEPBVTestCase@2@XZ - ?current_test_info@UnitTest@testing@@QBEPBVTestInfo@2@XZ - ?disabled_test_count@TestCase@testing@@QBEHXZ - ?disabled_test_count@UnitTest@testing@@QBEHXZ - ?elapsed_time@UnitTest@testing@@QBE_JXZ - ?failed_test_case_count@UnitTest@testing@@QBEHXZ - ?failed_test_count@TestCase@testing@@QBEHXZ - ?failed_test_count@UnitTest@testing@@QBEHXZ - ?g_linked_ptr_mutex@internal@testing@@3VMutex@12@A - ?listeners@UnitTest@testing@@QAEAAVTestEventListeners@2@XZ - ?name@TestInfo@testing@@QBEPBDXZ - ?original_working_dir@UnitTest@testing@@QBEPBDXZ - ?parameterized_test_registry@UnitTest@testing@@QAEAAVParameterizedTestCaseRegistry@internal@2@XZ - ?random_seed@UnitTest@testing@@QBEHXZ - ?result@TestInfo@testing@@QBEPBVTestResult@2@XZ - ?should_run@TestInfo@testing@@QBE_NXZ - ?successful_test_case_count@UnitTest@testing@@QBEHXZ - ?successful_test_count@TestCase@testing@@QBEHXZ - ?successful_test_count@UnitTest@testing@@QBEHXZ - ?test_case_comment@TestInfo@testing@@QBEPBDXZ - ?test_case_name@TestInfo@testing@@QBEPBDXZ - ?test_case_to_run_count@UnitTest@testing@@QBEHXZ - ?test_property_count@TestResult@testing@@QBEHXZ - ?test_to_run_count@TestCase@testing@@QBEHXZ - ?test_to_run_count@UnitTest@testing@@QBEHXZ - ?total_part_count@TestResult@testing@@QBEHXZ - ?total_test_case_count@UnitTest@testing@@QBEHXZ - ?total_test_count@TestCase@testing@@QBEHXZ - ?total_test_count@UnitTest@testing@@QBEHXZ -- cgit v1.2.3