From 6533abcb991d38e1e0e8e0f533def7f9cc9902c3 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Thu, 21 Aug 2008 11:41:49 -0500 Subject: [svn-r15503] Purpose: Add new app_ref test to Windows projects Description: A new test program, app_ref, was added to the source and configure script. We need to make special Windows project files for static and DLL versions of the test, and also VS2005 and VS.NET versions. Finally, include the new test in our script Tested: VS2005 on WinXP --- windows/proj/all/all.sln | 30 ++ windows/proj/all_fortran/all_fortran.sln | 34 ++- windows/test/app_ref/app_ref.vcproj | 364 +++++++++++++++++++++++++ windows/test/app_refdll/app_refdll.vcproj | 364 +++++++++++++++++++++++++ windows/test/checktests.bat | 1 + windows_vnet/proj/all/all.sln | 30 ++ windows_vnet/test/app_ref/app_ref.vcproj | 136 +++++++++ windows_vnet/test/app_refdll/app_refdll.vcproj | 136 +++++++++ 8 files changed, 1093 insertions(+), 2 deletions(-) create mode 100644 windows/test/app_ref/app_ref.vcproj create mode 100644 windows/test/app_refdll/app_refdll.vcproj create mode 100644 windows_vnet/test/app_ref/app_ref.vcproj create mode 100644 windows_vnet/test/app_refdll/app_refdll.vcproj diff --git a/windows/proj/all/all.sln b/windows/proj/all/all.sln index a38fa7c..69b4aca 100755 --- a/windows/proj/all/all.sln +++ b/windows/proj/all/all.sln @@ -152,6 +152,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{24E5C {6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1} {0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703} {8C6D9C00-44A9-432F-B695-F56439C1B288} = {8C6D9C00-44A9-432F-B695-F56439C1B288} + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7} = {C35122F6-49FF-4AAA-A2AA-482628E5E2A7} + {0C618DA2-4097-46B9-83D0-144AEB774568} = {0C618DA2-4097-46B9-83D0-144AEB774568} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "big", "..\..\test\big\big.vcproj", "{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}" @@ -1050,6 +1052,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_infodll", "..\..\test {C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_ref", "..\..\test\app_ref\app_ref.vcproj", "{C35122F6-49FF-4AAA-A2AA-482628E5E2A7}" + ProjectSection(ProjectDependencies) = postProject + {26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7} + {A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_refdll", "..\..\test\app_refdll\app_refdll.vcproj", "{0C618DA2-4097-46B9-83D0-144AEB774568}" + ProjectSection(ProjectDependencies) = postProject + {54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D} + {C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2294,6 +2308,22 @@ Global {D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|Win32.Build.0 = Release|Win32 {D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.ActiveCfg = Release|x64 {D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.Build.0 = Release|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|Win32.Build.0 = Debug|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|x64.ActiveCfg = Debug|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|x64.Build.0 = Debug|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|Win32.ActiveCfg = Release|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|Win32.Build.0 = Release|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|x64.ActiveCfg = Release|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|x64.Build.0 = Release|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|Win32.Build.0 = Debug|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|x64.ActiveCfg = Debug|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|x64.Build.0 = Debug|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|Win32.ActiveCfg = Release|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|Win32.Build.0 = Release|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|x64.ActiveCfg = Release|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/proj/all_fortran/all_fortran.sln b/windows/proj/all_fortran/all_fortran.sln index dc72a7e..5d605f7 100644 --- a/windows/proj/all_fortran/all_fortran.sln +++ b/windows/proj/all_fortran/all_fortran.sln @@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all_fortran", "all_fortran.vcproj", "{24E5C6DF-1FA4-49AD-AE75-1D9347966CC5}" ProjectSection(ProjectDependencies) = postProject - {531839A0-AFE6-482A-BF60-29890B89D4BF} = {531839A0-AFE6-482A-BF60-29890B89D4BF} - {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C} = {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C} {8C6D9C00-44A9-432F-B695-F56439C1B288} = {8C6D9C00-44A9-432F-B695-F56439C1B288} {0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703} {6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1} @@ -178,6 +176,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all_fortran", "all_fortran. {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} = {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} = {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} {3F645EFF-3A91-4CF3-9B60-76E0C33686A7} = {3F645EFF-3A91-4CF3-9B60-76E0C33686A7} + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7} = {C35122F6-49FF-4AAA-A2AA-482628E5E2A7} + {0C618DA2-4097-46B9-83D0-144AEB774568} = {0C618DA2-4097-46B9-83D0-144AEB774568} + {531839A0-AFE6-482A-BF60-29890B89D4BF} = {531839A0-AFE6-482A-BF60-29890B89D4BF} + {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C} = {04B72E84-6A91-4AF1-BFCD-110CD4F67E2C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "big", "..\..\test\big\big.vcproj", "{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}" @@ -1292,6 +1294,18 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testhdf5_fortran_1_8dll", " {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_ref", "..\..\test\app_ref\app_ref.vcproj", "{C35122F6-49FF-4AAA-A2AA-482628E5E2A7}" + ProjectSection(ProjectDependencies) = postProject + {26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7} + {A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_refdll", "..\..\test\app_refdll\app_refdll.vcproj", "{0C618DA2-4097-46B9-83D0-144AEB774568}" + ProjectSection(ProjectDependencies) = postProject + {54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D} + {C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2768,6 +2782,22 @@ Global {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|Win32.Build.0 = Release|Win32 {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|x64.ActiveCfg = Release|x64 {531839A0-AFE6-482A-BF60-29890B89D4BF}.Release|x64.Build.0 = Release|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|Win32.Build.0 = Debug|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|x64.ActiveCfg = Debug|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Debug|x64.Build.0 = Debug|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|Win32.ActiveCfg = Release|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|Win32.Build.0 = Release|Win32 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|x64.ActiveCfg = Release|x64 + {C35122F6-49FF-4AAA-A2AA-482628E5E2A7}.Release|x64.Build.0 = Release|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|Win32.Build.0 = Debug|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|x64.ActiveCfg = Debug|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Debug|x64.Build.0 = Debug|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|Win32.ActiveCfg = Release|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|Win32.Build.0 = Release|Win32 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|x64.ActiveCfg = Release|x64 + {0C618DA2-4097-46B9-83D0-144AEB774568}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/test/app_ref/app_ref.vcproj b/windows/test/app_ref/app_ref.vcproj new file mode 100644 index 0000000..96c58ad --- /dev/null +++ b/windows/test/app_ref/app_ref.vcproj @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/test/app_refdll/app_refdll.vcproj b/windows/test/app_refdll/app_refdll.vcproj new file mode 100644 index 0000000..480f29f --- /dev/null +++ b/windows/test/app_refdll/app_refdll.vcproj @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/test/checktests.bat b/windows/test/checktests.bat index 197ab04..721f0ff 100644 --- a/windows/test/checktests.bat +++ b/windows/test/checktests.bat @@ -103,6 +103,7 @@ rem on it for sending parameters. --SJW 9/6/07 call :add_test mount%2 .\mount%2\%1 call :add_test flush1%2 .\flush1%2\%1 call :add_test flush2%2 .\flush2%2\%1 + call :add_test app_ref%2 .\app_ref%2\%1 call :add_test enum%2 .\enum%2\%1 call :add_test set_extent%2 .\set_extent%2\%1 rem Test commented because threadsafe is not built by default on Windows. diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln index 2996cfd..277044b 100644 --- a/windows_vnet/proj/all/all.sln +++ b/windows_vnet/proj/all/all.sln @@ -62,6 +62,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE {0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A} = {0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A} {E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF} = {E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF} {55007273-E8A2-46FA-88B1-DC46D482710D} = {55007273-E8A2-46FA-88B1-DC46D482710D} + {F6351675-22B2-42D6-A766-505ACA6720FC} = {F6351675-22B2-42D6-A766-505ACA6720FC} {D0986B75-95F3-47F1-BC73-A6B499625C38} = {D0986B75-95F3-47F1-BC73-A6B499625C38} {1AC44D77-3A06-4122-B6AF-0D070F33AE6E} = {1AC44D77-3A06-4122-B6AF-0D070F33AE6E} {B179117A-7A08-4133-994B-1BB504CB2E05} = {B179117A-7A08-4133-994B-1BB504CB2E05} @@ -72,6 +73,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE {4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87} = {4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87} {71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4} = {71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4} {1CB57F87-1075-43CC-9693-ABFD5D296199} = {1CB57F87-1075-43CC-9693-ABFD5D296199} + {49D70E88-6911-4A96-815F-83891D7A0080} = {49D70E88-6911-4A96-815F-83891D7A0080} {B7655E88-CF1C-41F9-882F-C332D5E27E7A} = {B7655E88-CF1C-41F9-882F-C332D5E27E7A} {62A1D388-90C2-4832-81F5-AC94D5D6451B} = {62A1D388-90C2-4832-81F5-AC94D5D6451B} {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} @@ -1057,6 +1059,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_info", "..\..\test\ch {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_ref", "..\..\test\app_ref\app_ref.vcproj", "{F6351675-22B2-42D6-A766-505ACA6720FC}" + ProjectSection(ProjectDependencies) = postProject + {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE} + {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_refdll", "..\..\test\app_refdll\app_refdll.vcproj", "{49D70E88-6911-4A96-815F-83891D7A0080}" + ProjectSection(ProjectDependencies) = postProject + {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE} + {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE} + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution AlphaDbg = AlphaDbg @@ -2305,6 +2319,22 @@ Global {F99F5FC8-29C2-407E-BC74-AB2623686017}.Debug.Build.0 = Debug|Win32 {F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.ActiveCfg = Release|Win32 {F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.Build.0 = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.AlphaDbg.ActiveCfg = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.AlphaDbg.Build.0 = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.AlphaRel.ActiveCfg = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.AlphaRel.Build.0 = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.Debug.ActiveCfg = Debug|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.Debug.Build.0 = Debug|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.Release.ActiveCfg = Release|Win32 + {F6351675-22B2-42D6-A766-505ACA6720FC}.Release.Build.0 = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.AlphaDbg.ActiveCfg = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.AlphaDbg.Build.0 = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.AlphaRel.ActiveCfg = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.AlphaRel.Build.0 = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.Debug.ActiveCfg = Debug|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.Debug.Build.0 = Debug|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.Release.ActiveCfg = Release|Win32 + {49D70E88-6911-4A96-815F-83891D7A0080}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/windows_vnet/test/app_ref/app_ref.vcproj b/windows_vnet/test/app_ref/app_ref.vcproj new file mode 100644 index 0000000..6a959be --- /dev/null +++ b/windows_vnet/test/app_ref/app_ref.vcproj @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows_vnet/test/app_refdll/app_refdll.vcproj b/windows_vnet/test/app_refdll/app_refdll.vcproj new file mode 100644 index 0000000..49e4893 --- /dev/null +++ b/windows_vnet/test/app_refdll/app_refdll.vcproj @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12