diff --git a/src/PMDK.sln b/src/PMDK.sln index 7a6f50f9b5f2f8d81db3edbcfeb05a89b0364ded..121e9abf8aaf394f466102ce61c435e522de88c3 100644 --- a/src/PMDK.sln +++ b/src/PMDK.sln @@ -245,8 +245,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arch_flags", "test\arch_fla EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmem_mix_allocations", "test\vmem_mix_allocations\vmem_mix_allocations.vcxproj", "{537F759B-B617-48D9-A2F3-7FB769A8F9B7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmem_delete", "test\vmem_delete\vmem_delete.vcxproj", "{54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_mmap", "test\win_mmap\win_mmap.vcxproj", "{5580D11C-FDA6-4CF2-A0E8-1C2D3FBC11F1}" ProjectSection(ProjectDependencies) = postProject {CE3F2DFB-8470-4802-AD37-21CAF6CB2681} = {CE3F2DFB-8470-4802-AD37-21CAF6CB2681} @@ -1113,10 +1111,6 @@ Global {537F759B-B617-48D9-A2F3-7FB769A8F9B7}.Debug|x64.Build.0 = Debug|x64 {537F759B-B617-48D9-A2F3-7FB769A8F9B7}.Release|x64.ActiveCfg = Release|x64 {537F759B-B617-48D9-A2F3-7FB769A8F9B7}.Release|x64.Build.0 = Release|x64 - {54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}.Debug|x64.ActiveCfg = Debug|x64 - {54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}.Debug|x64.Build.0 = Debug|x64 - {54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}.Release|x64.ActiveCfg = Release|x64 - {54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}.Release|x64.Build.0 = Release|x64 {5580D11C-FDA6-4CF2-A0E8-1C2D3FBC11F1}.Debug|x64.ActiveCfg = Debug|x64 {5580D11C-FDA6-4CF2-A0E8-1C2D3FBC11F1}.Debug|x64.Build.0 = Debug|x64 {5580D11C-FDA6-4CF2-A0E8-1C2D3FBC11F1}.Release|x64.ActiveCfg = Release|x64 @@ -1892,7 +1886,6 @@ Global {513C4CFA-BD5B-4470-BA93-F6D43778A754} = {C721EFBD-45DC-479E-9B99-E62FCC1FC6E5} {53115A01-460C-4339-A2C8-AE1323A6E7EA} = {F09A0864-9221-47AD-872F-D4538104D747} {537F759B-B617-48D9-A2F3-7FB769A8F9B7} = {45E74E38-35CA-4CB6-8965-BC20D39659AF} - {54E6F8F5-418E-44BE-8DF2-5A60D9EE971B} = {45E74E38-35CA-4CB6-8965-BC20D39659AF} {5580D11C-FDA6-4CF2-A0E8-1C2D3FBC11F1} = {B870D8A6-12CD-4DD0-B843-833695C2310A} {581B3A58-F3F0-4765-91E5-D0C82816A528} = {C721EFBD-45DC-479E-9B99-E62FCC1FC6E5} {58386481-30B7-40FC-96AF-0723A4A7B228} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6} diff --git a/src/test/Makefile b/src/test/Makefile index 220341883419638920fd6bb00dfa41e47cd7c579..916c160d2a53b974989e1aff27f353e837185a43 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -245,7 +245,6 @@ VMEM_TESTS = \ vmem_create_error\ vmem_create_in_region\ vmem_custom_alloc\ - vmem_delete\ vmem_malloc\ vmem_malloc_usable_size\ vmem_mix_allocations\ diff --git a/src/test/vmem_delete/.gitignore b/src/test/vmem_delete/.gitignore deleted file mode 100644 index 3f5478f18dfe69cad4fca7e985cb0667083ec45f..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vmem_delete diff --git a/src/test/vmem_delete/Makefile b/src/test/vmem_delete/Makefile deleted file mode 100644 index a7d4a18565e5c3f4912c3d2ea0477ad177116bcd..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright 2014-2016, Intel Corporation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# src/test/vmem_delete/Makefile -- build vmem_delete unit test -# -TARGET = vmem_delete -OBJS = vmem_delete.o - -LIBVMEM=y - -include ../Makefile.inc diff --git a/src/test/vmem_delete/README b/src/test/vmem_delete/README deleted file mode 100644 index e63045e9afd044f0566f6a7c72584be075db49ca..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/README +++ /dev/null @@ -1,31 +0,0 @@ -Persistent Memory Development Kit - -This is src/test/vmem_delete/README. - -This directory contains a unit test for the vmem_delete() function. - -The program in vmem_delete.c takes operations as arguments. Operations -are encoded by characters. Each of them stands for one VMEM function: - 'h' - vmem_check() - 'f' - vmem_free() - 'm' - vmem_malloc() - 'c' - vmem_calloc() - 'r' - vmem_realloc() - 'a' - vmem_aligned_alloc() - 's' - vmem_strdup() - 'd' - vmem_delete() - -At the beginning the program creates a memory pool of the minimum size -(VMEM_MIN_POOL) from an already memory-mapped region using -vmem_create_in_region(). Then it allocates some memory and deletes -the pool using vmem_delete(). Now the proper test begins. For each given -argument the appropriate function is called for the already deleted pool, -and a return status is printed or SIGSEGV is caught and reported. - -For example: - - ./vmem_delete f m a - -this will call: vmem_free(), vmem_malloc() and vmem_aligned_alloc() -for the already deleted pool and print their return status. If SIGSEGV occurs, -it will be caught and reported for each of these functions. diff --git a/src/test/vmem_delete/TEST0 b/src/test/vmem_delete/TEST0 deleted file mode 100755 index c167944aa98f2716e51fadbfc870142908f4e832..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/TEST0 +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2014-2018, Intel Corporation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# src/test/vmem_delete/TEST0 -- unit test for vmem_delete -# - -# standard unit test setup -. ../unittest/unittest.sh - -require_test_type medium - -# This test generates sigsegvs on purpose. It issues various vmem -# operations on a pool that is already destroyed. -# Valgrind tools get puzzled with accesses to memory regions that are -# marked as non-acessible, locking destroyed mutexes, etc., so there -# is no point in running this test under Valgrind. -configure_valgrind memcheck force-disable -configure_valgrind helgrind force-disable -configure_valgrind drd force-disable - -require_fs_type none -setup - -# this test invokes sigsegvs by design -export ASAN_OPTIONS=handle_segv=0 - -expect_normal_exit ./vmem_delete$EXESUFFIX h f m c r a s d - -check - -pass diff --git a/src/test/vmem_delete/TEST0.PS1 b/src/test/vmem_delete/TEST0.PS1 deleted file mode 100644 index f8338593a1a6ed091f5b5206f9f358b5b8b37b8b..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/TEST0.PS1 +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2016-2018, Intel Corporation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# src/test/vmem_delete/TEST0.PS1 -- unit test for vmem_delete -# - -# standard unit test setup -. ..\unittest\unittest.ps1 - -require_test_type medium -require_fs_type none - -setup - -expect_normal_exit $Env:EXE_DIR\vmem_delete$Env:EXESUFFIX h f m c r a s d - -check - -pass diff --git a/src/test/vmem_delete/out0.log.match b/src/test/vmem_delete/out0.log.match deleted file mode 100644 index 6b6ad92a89821beff0d5292500862d627b8eeea1..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/out0.log.match +++ /dev/null @@ -1,19 +0,0 @@ -vmem_delete$(nW)TEST0: START: vmem_delete - $(nW)vmem_delete$(nW) h f m c r a s d -Testing vmem_check... - vmem_check returned -1 -Testing vmem_free... - vmem_free succeeded -Testing vmem_malloc... - signal: $(*) -Testing vmem_calloc... - signal: $(*) -Testing vmem_realloc... - signal: $(*) -Testing vmem_aligned_alloc... - signal: $(*) -Testing vmem_strdup... - signal: $(*) -Testing vmem_delete... - vmem_delete failed: invalid pool handle: 0x$(X) -vmem_delete$(nW)TEST0: DONE diff --git a/src/test/vmem_delete/vmem_delete.c b/src/test/vmem_delete/vmem_delete.c deleted file mode 100644 index f2f301075417d2aa4f5a3a658dfc787540ce8f0a..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/vmem_delete.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright 2014-2017, Intel Corporation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * vmem_delete.c -- unit test for vmem_delete - * - * usage: vmem_delete <operation> - * - * operations are: 'h', 'f', 'm', 'c', 'r', 'a', 's', 'd' - * - */ - -#include "unittest.h" - -static ut_jmp_buf_t Jmp; - -#ifndef _WIN32 -#include <unistd.h> -#include <stdbool.h> -static bool is_done; -#endif - -/* - * signal_handler -- called on SIGSEGV - */ -static void -signal_handler(int sig) -{ -#ifndef _WIN32 - /* Ignore signals from jemalloc destructor */ - if (is_done) - _exit(0); -#endif - - UT_OUT("\tsignal: %s", os_strsignal(sig)); - ut_siglongjmp(Jmp); -} - -int -main(int argc, char *argv[]) -{ - START(argc, argv, "vmem_delete"); - - VMEM *vmp; - void *ptr; - if (argc < 2) - UT_FATAL("usage: %s op:h|f|m|c|r|a|s|d", argv[0]); - - /* allocate memory for function vmem_create_in_region() */ - void *mem_pool = MMAP_ANON_ALIGNED(VMEM_MIN_POOL, 4 << 20); - - vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL); - if (vmp == NULL) - UT_FATAL("!vmem_create_in_region"); - - ptr = vmem_malloc(vmp, sizeof(long long)); - if (ptr == NULL) - UT_ERR("!vmem_malloc"); - vmem_delete(vmp); - ASAN_POISON_MEMORY_REGION(vmp, sizeof(vmp)); - - /* arrange to catch SEGV */ - struct sigaction v; - sigemptyset(&v.sa_mask); - v.sa_flags = 0; - v.sa_handler = signal_handler; - SIGACTION(SIGSEGV, &v, NULL); - SIGACTION(SIGABRT, &v, NULL); - SIGACTION(SIGILL, &v, NULL); - - /* go through all arguments one by one */ - for (int arg = 1; arg < argc; arg++) { - /* Scan the character of each argument. */ - if (strchr("hfmcrasd", argv[arg][0]) == NULL || - argv[arg][1] != '\0') - UT_FATAL("op must be one of: h, f, m, c, r, a, s, d"); - - switch (argv[arg][0]) { - case 'h': - UT_OUT("Testing vmem_check..."); - if (!ut_sigsetjmp(Jmp)) { - UT_OUT("\tvmem_check returned %i", - vmem_check(vmp)); - } - break; - - case 'f': - UT_OUT("Testing vmem_free..."); - if (!ut_sigsetjmp(Jmp)) { - vmem_free(vmp, ptr); - UT_OUT("\tvmem_free succeeded"); - } - break; - - case 'm': - UT_OUT("Testing vmem_malloc..."); - if (!ut_sigsetjmp(Jmp)) { - ptr = vmem_malloc(vmp, sizeof(long long)); - if (ptr != NULL) - UT_OUT("\tvmem_malloc succeeded"); - else - UT_OUT("\tvmem_malloc returned NULL"); - } - break; - - case 'c': - UT_OUT("Testing vmem_calloc..."); - if (!ut_sigsetjmp(Jmp)) { - ptr = vmem_calloc(vmp, 10, sizeof(int)); - if (ptr != NULL) - UT_OUT("\tvmem_calloc succeeded"); - else - UT_OUT("\tvmem_calloc returned NULL"); - } - break; - - case 'r': - UT_OUT("Testing vmem_realloc..."); - if (!ut_sigsetjmp(Jmp)) { - ptr = vmem_realloc(vmp, ptr, 128); - if (ptr != NULL) - UT_OUT("\tvmem_realloc succeeded"); - else - UT_OUT("\tvmem_realloc returned NULL"); - } - break; - - case 'a': - UT_OUT("Testing vmem_aligned_alloc..."); - if (!ut_sigsetjmp(Jmp)) { - ptr = vmem_aligned_alloc(vmp, 128, 128); - if (ptr != NULL) - UT_OUT("\tvmem_aligned_alloc " - "succeeded"); - else - UT_OUT("\tvmem_aligned_alloc" - " returned NULL"); - } - break; - - case 's': - UT_OUT("Testing vmem_strdup..."); - if (!ut_sigsetjmp(Jmp)) { - ptr = vmem_strdup(vmp, "Test string"); - if (ptr != NULL) - UT_OUT("\tvmem_strdup succeeded"); - else - UT_OUT("\tvmem_strdup returned NULL"); - } - break; - - case 'd': - UT_OUT("Testing vmem_delete..."); - if (!ut_sigsetjmp(Jmp)) { - vmem_delete(vmp); - if (errno != 0) - UT_OUT("\tvmem_delete failed: %s", - vmem_errormsg()); - else - UT_OUT("\tvmem_delete succeeded"); - } - break; - } - } - - MUNMAP(mem_pool, VMEM_MIN_POOL); - -#ifndef _WIN32 - is_done = true; -#endif - - DONE(NULL); -} diff --git a/src/test/vmem_delete/vmem_delete.vcxproj b/src/test/vmem_delete/vmem_delete.vcxproj deleted file mode 100644 index 2bccfe0584fc6482bb6f61dfdb57a89f244aba3d..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/vmem_delete.vcxproj +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <None Include="out0.log.match" /> - <None Include="TEST0.PS1" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\libvmem\libvmem.vcxproj"> - <Project>{08762559-e9df-475b-ba99-49f4b5a1d80b}</Project> - </ProjectReference> - <ProjectReference Include="..\unittest\libut.vcxproj"> - <Project>{ce3f2dfb-8470-4802-ad37-21caf6cb2681}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClCompile Include="vmem_delete.c" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{54E6F8F5-418E-44BE-8DF2-5A60D9EE971B}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>vmem_delete</RootNamespace> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\test_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\test_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile /> - <Link /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile /> - <Link /> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file diff --git a/src/test/vmem_delete/vmem_delete.vcxproj.filters b/src/test/vmem_delete/vmem_delete.vcxproj.filters deleted file mode 100644 index ccad28f82907dddcae04a9e02a51797cd192d72d..0000000000000000000000000000000000000000 --- a/src/test/vmem_delete/vmem_delete.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Match Files"> - <UniqueIdentifier>{4d39e0e5-0c47-48a1-8ceb-6c174a170013}</UniqueIdentifier> - </Filter> - <Filter Include="Test Scripts"> - <UniqueIdentifier>{bdfb5bc0-aa19-4831-b79b-359182bd4c74}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="out0.log.match"> - <Filter>Match Files</Filter> - </None> - <None Include="TEST0.PS1"> - <Filter>Test Scripts</Filter> - </None> - </ItemGroup> - <ItemGroup> - <ClCompile Include="vmem_delete.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project> \ No newline at end of file