diff options
2959 files changed, 6022 insertions, 37753 deletions
diff --git a/docs/workflow/testing/coreclr/unix-test-instructions.md b/docs/workflow/testing/coreclr/unix-test-instructions.md index 6c86c041947..2c56ebc2f9c 100644 --- a/docs/workflow/testing/coreclr/unix-test-instructions.md +++ b/docs/workflow/testing/coreclr/unix-test-instructions.md @@ -81,15 +81,23 @@ PAL tests Build CoreCLR with PAL tests on the Unix machine: -```sh -./src/coreclr/build-runtime.sh -skipgenerateversion -nopgooptimize \ - -cmakeargs -DCLR_CMAKE_BUILD_TESTS=1 +```sh ./build.sh clr.paltests ``` Run tests: +To run all tests including disabled tests +```sh +./src/coreclr/src/pal/tests/palsuite/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests +# on macOS, replace $(uname) with OSX +``` +To only run enabled tests for the platform the tests were built for: ```sh -./src/coreclr/src/pal/tests/palsuite/runpaltests.sh $(pwd)/artifacts/obj/coreclr/$(uname).x64.Debug +artifacts/bin/coreclr/$(uname).x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests +# on macOS, replace $(uname) with OSX ``` Test results will go into: `/tmp/PalTestOutput/default/pal_tests.xml` + +To disable tests in the CI edit +`src/coreclr/src/pal/tests/palsuite/issues.targets`
\ No newline at end of file diff --git a/eng/Subsets.props b/eng/Subsets.props index 27a87e447b8..c36665c8340 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -67,6 +67,7 @@ </PropertyGroup> <PropertyGroup> + <_subset>$(_subset.Replace('+clr.paltests+', '+clr.paltests+clr.paltestlist+'))</_subset> <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+'))</_subset> <_subset>$(_subset.Replace('+mono+', '+$(DefaultMonoSubsets)+'))</_subset> <_subset>$(_subset.Replace('+libs+', '+$(DefaultLibrariesSubsets)+'))</_subset> @@ -84,6 +85,8 @@ <!-- CoreClr --> <SubsetName Include="Clr" Description="The CoreCLR runtime, LinuxDac, CoreLib (+ native), tools and packages." /> <SubsetName Include="Clr.Runtime" Description="The CoreCLR .NET runtime." /> + <SubsetName Include="Clr.PalTests" Description="The CoreCLR PAL tests." /> + <SubsetName Include="Clr.PalTestList" Description="Generate the list of the CoreCLR PAL tests. When using the command line, use Clr.PalTests instead." /> <SubsetName Include="Clr.Jit" Description="The JIT for the CoreCLR .NET runtime." /> <SubsetName Include="Clr.AllJits" Description="All of the cross-targeting JIT compilers for the CoreCLR .NET runtime." /> <SubsetName Include="Clr.CoreLib" Description="The managed System.Private.CoreLib library for CoreCLR." /> @@ -147,6 +150,10 @@ <ClrRuntimeBuildSubsets>$(ClrRuntimeBuildSubsets);ClrJitSubset=true</ClrRuntimeBuildSubsets> </PropertyGroup> + <PropertyGroup Condition="$(_subset.Contains('+clr.paltests+'))"> + <ClrRuntimeBuildSubsets>$(ClrRuntimeBuildSubsets);ClrPalTestsSubset=true</ClrRuntimeBuildSubsets> + </PropertyGroup> + <PropertyGroup Condition="$(_subset.Contains('+clr.alljits+'))"> <ClrRuntimeBuildSubsets>$(ClrRuntimeBuildSubsets);ClrAllJitsSubset=true;ClrJitSubset=true</ClrRuntimeBuildSubsets> </PropertyGroup> @@ -155,6 +162,10 @@ <ProjectToBuild Include="$(CoreClrProjectRoot)runtime.proj" AdditionalProperties="%(AdditionalProperties);$(ClrRuntimeBuildSubsets)" Category="clr" /> </ItemGroup> + <ItemGroup Condition="$(_subset.Contains('+clr.paltestlist+'))"> + <ProjectToBuild Include="$(CoreClrProjectRoot)src/pal/tests/palsuite/producepaltestlist.proj" /> + </ItemGroup> + <ItemGroup Condition="$(_subset.Contains('+linuxdac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'"> <ProjectToBuild Include="$(CoreClrProjectRoot)runtime.proj" AdditionalProperties="%(AdditionalProperties);$(ClrDefaultRuntimeBuildSubsets);CrossDac=linux" Category="clr" /> </ItemGroup> diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake index 420b7d1a88f..525c289d988 100644 --- a/eng/native/functions.cmake +++ b/eng/native/functions.cmake @@ -356,11 +356,10 @@ function(install_symbols symbol_file destination_path) endif() endfunction() -# install_clr(TARGETS TARGETS targetName [targetName2 ...] [ADDITIONAL_DESTINATION destination]) +# install_clr(TARGETS TARGETS targetName [targetName2 ...] [ADDITIONAL_DESTINATIONS destination]) function(install_clr) - set(oneValueArgs ADDITIONAL_DESTINATION) - set(multiValueArgs TARGETS) - cmake_parse_arguments(INSTALL_CLR "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV}) + set(multiValueArgs TARGETS ADDITIONAL_DESTINATIONS) + cmake_parse_arguments(INSTALL_CLR "" "" "${multiValueArgs}" ${ARGV}) if ("${INSTALL_CLR_TARGETS}" STREQUAL "") message(FATAL_ERROR "At least one target must be passed to install_clr(TARGETS )") @@ -368,8 +367,8 @@ function(install_clr) set(destinations ".") - if (NOT "${INSTALL_CLR_ADDITIONAL_DESTINATION}" STREQUAL "") - list(APPEND destinations ${INSTALL_CLR_ADDITIONAL_DESTINATION}) + if (NOT "${INSTALL_CLR_ADDITIONAL_DESTINATIONS}" STREQUAL "") + list(APPEND destinations ${INSTALL_CLR_ADDITIONAL_DESTINATIONS}) endif() foreach(targetName ${INSTALL_CLR_TARGETS}) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 3c7dedfb19d..652e98a90cf 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -313,6 +313,9 @@ jobs: runCrossGen: ${{ and(eq(parameters.readyToRun, true), ne(parameters.crossgen2, true)) }} runCrossGen2: ${{ and(eq(parameters.readyToRun, true), eq(parameters.crossgen2, true)) }} + ${{ if and(ne(parameters.testGroup, 'innerloop'), eq(parameters.runtimeFlavor, 'coreclr')) }}: + runPALTestsDir: '$(coreClrProductRootFolderPath)/paltests' + compositeBuildMode: ${{ parameters.compositeBuildMode }} runInUnloadableContext: ${{ parameters.runInUnloadableContext }} diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index 975179232eb..febcfa4016d 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -17,6 +17,7 @@ parameters: timeoutPerTestInMinutes: '' runCrossGen: '' runCrossGen2: '' + runPALTestsDir: '' compositeBuildMode: false helixProjectArguments: '' runInUnloadableContext: '' @@ -48,6 +49,7 @@ steps: _LongRunningGcTests: ${{ parameters.longRunningGcTests }} _GcSimulatorTests: ${{ parameters.gcSimulatorTests }} _Scenarios: ${{ join(',', parameters.scenarios) }} + _PALTestsDir: ${{ parameters.runPALTestsDir }} _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }} _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }} runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 65c02d9371d..526b43afcc7 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -109,6 +109,12 @@ jobs: - ${{ if eq(parameters.testGroup, 'clrinterpreter') }}: - name: clrInterpreterBuildArg value: '-cmakeargs "-DFEATURE_INTERPRETER=1"' + + - name: clrBuildPALTestsBuildArg + value: '' + - ${{ if ne(parameters.testGroup, 'innerloop') }}: + - name: clrBuildPALTestsBuildArg + value: '-paltests ' - ${{ parameters.variables }} @@ -141,7 +147,7 @@ jobs: # Build CoreCLR Runtime - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) + - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrBuildPALTestsBuildArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) displayName: Build CoreCLR Runtime - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(enforcePgoArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) @@ -154,7 +160,7 @@ jobs: displayName: Disk Usage after Build # Build CoreCLR Managed Components - - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib+clr.nativecorelib+clr.tools+clr.packages $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) -ci + - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib+clr.nativecorelib+clr.tools+clr.packages+clr.paltestlist $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) -ci displayName: Build managed product components and packages # Run CoreCLR Tools unit tests diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd index c152d94137f..b867df93290 100644 --- a/src/coreclr/build-runtime.cmd +++ b/src/coreclr/build-runtime.cmd @@ -85,6 +85,7 @@ set __SkipCrossArchNative=0 set __SkipGenerateVersion=0 set __RestoreOptData=1 set __BuildJit=1 +set __BuildPALTests=0 set __BuildAllJits=1 set __BuildRuntime=1 set __CrossArch= diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh index f4007ebd1a7..f7dd55e2883 100755 --- a/src/coreclr/build-runtime.sh +++ b/src/coreclr/build-runtime.sh @@ -25,6 +25,7 @@ usage_list+=("-staticanalyzer: skip native image generation.") usage_list+=("-skipjit: skip building jit.") usage_list+=("-skipalljits: skip building crosstargetting jits.") usage_list+=("-skipruntime: skip building runtime.") +usage_list+=("-paltests: build the pal tests.") setup_dirs_local() { @@ -135,6 +136,10 @@ handle_arguments_local() { skipruntime|-skipruntime) __BuildRuntime=0 ;; + + paltests|-paltests) + __BuildPALTests=1 + ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" ;; @@ -187,7 +192,7 @@ __UseNinja=0 __VerboseBuild=0 __ValidateCrossArg=1 __CMakeArgs="" -__BuildJit=1 +__BuildPALTests=0 __BuildAllJits=1 __BuildRuntime=1 @@ -247,6 +252,7 @@ restore_optdata # Build the coreclr (native) components. __CMakeArgs="-DCLR_CMAKE_PGO_INSTRUMENT=$__PgoInstrument -DCLR_CMAKE_OPTDATA_PATH=$__PgoOptDataPath -DCLR_CMAKE_PGO_OPTIMIZE=$__PgoOptimize -DCLR_REPO_ROOT_DIR=\"$__RepoRootDir\" $__CMakeArgs" __CMakeArgs="-DCLR_CMAKE_BUILD_SUBSET_JIT=$__BuildJit -DCLR_CMAKE_BUILD_SUBSET_ALLJITS=$__BuildAllJits -DCLR_CMAKE_BUILD_SUBSET_RUNTIME=$__BuildRuntime $__CMakeArgs" +__CMakeArgs="-DCLR_CMAKE_BUILD_TESTS=$__BuildPALTests $__CMakeArgs" if [[ "$__SkipConfigure" == 0 && "$__CodeCoverage" == 1 ]]; then __CMakeArgs="-DCLR_CMAKE_ENABLE_CODE_COVERAGE=1 $__CMakeArgs" diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj index 7ea711cf15b..79b99c1649e 100644 --- a/src/coreclr/runtime.proj +++ b/src/coreclr/runtime.proj @@ -23,6 +23,7 @@ <_CoreClrBuildArg Condition="'$(NoPgoOptimize)' == 'true'" Include="-nopgooptimize" /> <_CoreClrBuildArg Condition="'$(ClrRuntimeSubset)' != 'true'" Include="-skipruntime" /> <_CoreClrBuildArg Condition="'$(ClrJitSubset)' != 'true'" Include="-skipjit" /> + <_CoreClrBuildArg Condition="'$(ClrPalTestsSubset)' == 'true'" Include="-paltests" /> <_CoreClrBuildArg Condition="'$(ClrAllJitsSubset)' != 'true'" Include="-skipalljits" /> <_CoreClrBuildArg Condition="'$(NoPgoOptimize)' == 'true'" Include="-nopgooptimize" /> </ItemGroup> diff --git a/src/coreclr/src/debug/createdump/CMakeLists.txt b/src/coreclr/src/debug/createdump/CMakeLists.txt index 80f9487dfc0..71b6083f9bc 100644 --- a/src/coreclr/src/debug/createdump/CMakeLists.txt +++ b/src/coreclr/src/debug/createdump/CMakeLists.txt @@ -86,4 +86,4 @@ endif(CLR_CMAKE_HOST_OSX) endif(CLR_CMAKE_HOST_WIN32) -install_clr(TARGETS createdump ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS createdump ADDITIONAL_DESTINATIONS sharedFramework) diff --git a/src/coreclr/src/dlls/clretwrc/CMakeLists.txt b/src/coreclr/src/dlls/clretwrc/CMakeLists.txt index 9935362c0c9..d2cb5cfae98 100644 --- a/src/coreclr/src/dlls/clretwrc/CMakeLists.txt +++ b/src/coreclr/src/dlls/clretwrc/CMakeLists.txt @@ -20,6 +20,6 @@ add_library_clr(clretwrc SHARED ) # add the install targets -install_clr(TARGETS clretwrc ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS clretwrc ADDITIONAL_DESTINATIONS sharedFramework) add_dependencies(clretwrc eventing_headers) diff --git a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt index 54cedfeb2c2..5f026214382 100644 --- a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt +++ b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt @@ -78,4 +78,4 @@ endif(CLR_CMAKE_HOST_WIN32) target_link_libraries(dbgshim ${DBGSHIM_LIBRARIES}) # add the install targets -install_clr(TARGETS dbgshim ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS dbgshim ADDITIONAL_DESTINATIONS sharedFramework) diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt index 7a3e19525f2..f1acbdce5f9 100644 --- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt @@ -194,7 +194,7 @@ if(FEATURE_SINGLE_FILE_DIAGNOSTICS) endif(FEATURE_SINGLE_FILE_DIAGNOSTICS) # add the install targets -install_clr(TARGETS mscordaccore ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS mscordaccore ADDITIONAL_DESTINATIONS sharedFramework) if(CLR_CMAKE_HOST_WIN32) set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_HOST_ARCH}) diff --git a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt index b87b3eadb6a..7aa7a2a1e14 100644 --- a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt @@ -118,4 +118,4 @@ if(FEATURE_SINGLE_FILE_DIAGNOSTICS) endif(FEATURE_SINGLE_FILE_DIAGNOSTICS) # add the install targets -install_clr(TARGETS mscordbi ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS mscordbi ADDITIONAL_DESTINATIONS sharedFramework) diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt index 2a25b2119b3..67cbf59fe94 100644 --- a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -228,7 +228,7 @@ if(CLR_CMAKE_TARGET_WIN32) endif(CLR_CMAKE_TARGET_WIN32) # add the install targets -install_clr(TARGETS coreclr ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS coreclr ADDITIONAL_DESTINATIONS sharedFramework) # publish coreclr_static lib _install(TARGETS coreclr_static DESTINATION lib) diff --git a/src/coreclr/src/dlls/mscorrc/CMakeLists.txt b/src/coreclr/src/dlls/mscorrc/CMakeLists.txt index e114ec19cea..040b12a240a 100644 --- a/src/coreclr/src/dlls/mscorrc/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscorrc/CMakeLists.txt @@ -15,7 +15,7 @@ if(CLR_CMAKE_HOST_WIN32) include.rc ) - install_clr(TARGETS mscorrc ADDITIONAL_DESTINATION sharedFramework) + install_clr(TARGETS mscorrc ADDITIONAL_DESTINATIONS sharedFramework) else() build_resources(${CMAKE_CURRENT_SOURCE_DIR}/include.rc mscorrc TARGET_CPP_FILE) diff --git a/src/coreclr/src/jit/CMakeLists.txt b/src/coreclr/src/jit/CMakeLists.txt index d26d81c4205..314db3989a6 100644 --- a/src/coreclr/src/jit/CMakeLists.txt +++ b/src/coreclr/src/jit/CMakeLists.txt @@ -12,9 +12,10 @@ add_compile_options($<$<CXX_COMPILER_ID:MSVC>:-W4>) function(create_standalone_jit) - set(oneValueArgs TARGET OS ARCH ADDITIONAL_DESTINATION) + set(oneValueArgs TARGET OS ARCH) + set(multiValueArgs ADDITIONAL_DESTINATIONS) set(options NOALTJIT) - cmake_parse_arguments(TARGETDETAILS "${options}" "${oneValueArgs}" "" ${ARGN}) + cmake_parse_arguments(TARGETDETAILS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_${TARGETDETAILS_OS}_${TARGETDETAILS_ARCH}) @@ -30,10 +31,10 @@ function(create_standalone_jit) clr_unknown_arch() endif() - if (TARGETDETAILS_ADDITIONAL_DESTINATION STREQUAL "") + if (TARGETDETAILS_ADDITIONAL_DESTINATIONS STREQUAL "") add_jit(${TARGETDETAILS_TARGET}) else() - add_jit(${TARGETDETAILS_TARGET} ADDITIONAL_DESTINATION "${TARGETDETAILS_ADDITIONAL_DESTINATION}") + add_jit(${TARGETDETAILS_TARGET} ADDITIONAL_DESTINATIONS "${TARGETDETAILS_ADDITIONAL_DESTINATIONS}") endif() set_target_definitions_to_custom_os_and_arch(${ARGN}) @@ -411,7 +412,7 @@ else() endif(CLR_CMAKE_HOST_UNIX) # Shared function for generating JIT -# optional arguments: ADDITIONAL_DESTINATION path +# optional arguments: ADDITIONAL_DESTINATIONS path function(add_jit jitName) set_source_files_properties(${JIT_EXPORTS_FILE} PROPERTIES GENERATED TRUE) @@ -459,7 +460,7 @@ else() set(TARGET_OS_NAME win) endif() -create_standalone_jit(TARGET clrjit OS ${TARGET_OS_NAME} ARCH ${ARCH_TARGET_NAME} NOALTJIT ADDITIONAL_DESTINATION sharedFramework) +create_standalone_jit(TARGET clrjit OS ${TARGET_OS_NAME} ARCH ${ARCH_TARGET_NAME} NOALTJIT ADDITIONAL_DESTINATIONS sharedFramework) # Enable profile guided optimization add_pgo(clrjit) diff --git a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt index b6b54e24ac7..cd6771955e4 100644 --- a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt +++ b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt @@ -72,4 +72,4 @@ set_target_properties(coreclrtraceptprovider PROPERTIES LINKER_LANGUAGE CXX) # Install the static eventprovider library _install(TARGETS eventprovider DESTINATION lib) # Install the static coreclrtraceptprovider library -install_clr(TARGETS coreclrtraceptprovider ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS coreclrtraceptprovider ADDITIONAL_DESTINATIONS sharedFramework paltests) diff --git a/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt index 091da03fba3..f30ef84f423 100644 --- a/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt @@ -25,21 +25,908 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options(-Wno-int-to-pointer-cast) endif() -# TODO: make these tests compile -# add_subdirectory(composite) -add_subdirectory(exception_handling) - -add_subdirectory(c_runtime) -add_subdirectory(debug_api) -add_subdirectory(filemapping_memmgt) -add_subdirectory(file_io) -add_subdirectory(loader) -add_subdirectory(locale_info) -add_subdirectory(miscellaneous) -add_subdirectory(pal_specific) -add_subdirectory(samples) -add_subdirectory(threading) +#these PAL tests have special build needs, and are built separately +add_subdirectory(exception_handling/pal_sxs/test1) if(FEATURE_EVENT_TRACE) add_subdirectory(eventprovider) endif(FEATURE_EVENT_TRACE) + +_add_executable(paltests + paltests.cpp + common/palsuite.cpp + #composite/object_management/event/nonshared/event.cpp + #composite/object_management/event/nonshared/main.cpp + #composite/object_management/event/shared/event.cpp + #composite/object_management/event/shared/main.cpp + #composite/object_management/mutex/nonshared/main.cpp + #composite/object_management/mutex/nonshared/mutex.cpp + #composite/object_management/mutex/shared/main.cpp + #composite/object_management/mutex/shared/mutex.cpp + #composite/object_management/semaphore/nonshared/main.cpp + #composite/object_management/semaphore/nonshared/semaphore.cpp + #composite/object_management/semaphore/shared/main.cpp + #composite/object_management/semaphore/shared/semaphore.cpp + #composite/synchronization/criticalsection/criticalsection.cpp + #composite/synchronization/criticalsection/mainWrapper.cpp + #composite/synchronization/nativecriticalsection/mtx_critsect.cpp + #composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp + #composite/synchronization/nativecriticalsection/resultbuffer.cpp + #composite/synchronization/nativecs_interlocked/interlocked.cpp + #composite/synchronization/nativecs_interlocked/mtx_critsect.cpp + #composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp + #composite/synchronization/nativecs_interlocked/resultbuffer.cpp + #composite/threading/threadsuspension/mainWrapper.cpp + #composite/threading/threadsuspension/threadsuspension.cpp + #composite/threading/threadsuspension_switchthread/mainWrapper.cpp + #composite/threading/threadsuspension_switchthread/threadsuspension.cpp + #composite/wfmo/main.cpp + #composite/wfmo/mutex.cpp + c_runtime/abs/test1/abs.cpp + c_runtime/acos/test1/test1.cpp + c_runtime/acosf/test1/test1.cpp + c_runtime/acosh/test1/test1.cpp + c_runtime/acoshf/test1/test1.cpp + c_runtime/asin/test1/test1.cpp + c_runtime/asinf/test1/test1.cpp + c_runtime/asinh/test1/test1.cpp + c_runtime/asinhf/test1/test1.cpp + c_runtime/atan/test1/test1.cpp + c_runtime/atan2/test1/test1.cpp + c_runtime/atan2f/test1/test1.cpp + c_runtime/atanf/test1/test1.cpp + c_runtime/atanh/test1/test1.cpp + c_runtime/atanhf/test1/test1.cpp + c_runtime/atof/test1/test1.cpp + c_runtime/atoi/test1/test1.cpp + c_runtime/bsearch/test1/test1.cpp + c_runtime/bsearch/test2/test2.cpp + c_runtime/cbrt/test1/test1.cpp + c_runtime/cbrtf/test1/test1.cpp + c_runtime/ceil/test1/test1.cpp + c_runtime/ceilf/test1/test1.cpp + c_runtime/cos/test1/test1.cpp + c_runtime/cosf/test1/test1.cpp + c_runtime/cosh/test1/test1.cpp + c_runtime/coshf/test1/test1.cpp + c_runtime/errno/test1/test1.cpp + c_runtime/errno/test2/test2.cpp + c_runtime/exit/test1/test1.cpp + c_runtime/exit/test2/test2.cpp + c_runtime/exp/test1/test1.cpp + c_runtime/expf/test1/test1.cpp + c_runtime/fabs/test1/test1.cpp + c_runtime/fabsf/test1/test1.cpp + c_runtime/fclose/test1/test1.cpp + c_runtime/fclose/test2/test2.cpp + c_runtime/ferror/test1/test1.cpp + c_runtime/ferror/test2/test2.cpp + c_runtime/fflush/test1/test1.cpp + c_runtime/fgets/test1/test1.cpp + c_runtime/fgets/test2/test2.cpp + c_runtime/fgets/test3/test3.cpp + c_runtime/floor/test1/test1.cpp + c_runtime/floorf/test1/test1.cpp + c_runtime/fma/test1/test1.cpp + c_runtime/fmaf/test1/test1.cpp + c_runtime/fmod/test1/test1.cpp + c_runtime/fmodf/test1/test1.cpp + c_runtime/fopen/test1/test1.cpp + c_runtime/fopen/test2/test2.cpp + c_runtime/fopen/test3/test3.cpp + c_runtime/fopen/test4/test4.cpp + c_runtime/fopen/test5/test5.cpp + c_runtime/fopen/test6/test6.cpp + c_runtime/fopen/test7/test7.cpp + c_runtime/fprintf/test1/test1.cpp + c_runtime/fprintf/test10/test10.cpp + c_runtime/fprintf/test11/test11.cpp + c_runtime/fprintf/test12/test12.cpp + c_runtime/fprintf/test13/test13.cpp + c_runtime/fprintf/test14/test14.cpp + c_runtime/fprintf/test15/test15.cpp + c_runtime/fprintf/test16/test16.cpp + c_runtime/fprintf/test17/test17.cpp + c_runtime/fprintf/test18/test18.cpp + c_runtime/fprintf/test19/test19.cpp + c_runtime/fprintf/test2/test2.cpp + c_runtime/fprintf/test3/test3.cpp + c_runtime/fprintf/test4/test4.cpp + c_runtime/fprintf/test5/test5.cpp + c_runtime/fprintf/test6/test6.cpp + c_runtime/fprintf/test7/test7.cpp + c_runtime/fprintf/test8/test8.cpp + c_runtime/fprintf/test9/test9.cpp + c_runtime/fputs/test1/test1.cpp + c_runtime/fputs/test2/test2.cpp + c_runtime/fread/test1/test1.cpp + c_runtime/fread/test2/test2.cpp + c_runtime/fread/test3/test3.cpp + c_runtime/free/test1/test1.cpp + c_runtime/fseek/test1/test1.cpp + c_runtime/ftell/test1/ftell.cpp + c_runtime/fwprintf/test1/test1.cpp + c_runtime/fwprintf/test10/test10.cpp + c_runtime/fwprintf/test11/test11.cpp + c_runtime/fwprintf/test12/test12.cpp + c_runtime/fwprintf/test13/test13.cpp + c_runtime/fwprintf/test14/test14.cpp + c_runtime/fwprintf/test15/test15.cpp + c_runtime/fwprintf/test16/test16.cpp + c_runtime/fwprintf/test17/test17.cpp + c_runtime/fwprintf/test18/test18.cpp + c_runtime/fwprintf/test19/test19.cpp + c_runtime/fwprintf/test2/test2.cpp + c_runtime/fwprintf/test3/test3.cpp + c_runtime/fwprintf/test4/test4.cpp + c_runtime/fwprintf/test5/test5.cpp + c_runtime/fwprintf/test6/test6.cpp + c_runtime/fwprintf/test7/test7.cpp + c_runtime/fwprintf/test8/test8.cpp + c_runtime/fwprintf/test9/test9.cpp + c_runtime/fwrite/test1/test1.cpp + c_runtime/getenv/test1/test1.cpp + c_runtime/getenv/test2/test2.cpp + c_runtime/getenv/test3/test3.cpp + c_runtime/ilogb/test1/test1.cpp + c_runtime/ilogbf/test1/test1.cpp + c_runtime/isalnum/test1/test1.cpp + c_runtime/isalpha/test1/test1.cpp + c_runtime/isdigit/test1/test1.cpp + c_runtime/islower/test1/test1.cpp + c_runtime/isprint/test1/isprint.cpp + c_runtime/isprint/test2/test2.cpp + c_runtime/isspace/test1/test1.cpp + c_runtime/isupper/test1/test1.cpp + c_runtime/iswdigit/test1/test1.cpp + #c_runtime/iswprint/test1/test1.cpp + c_runtime/iswspace/test1/test1.cpp + c_runtime/iswupper/test1/test1.cpp + c_runtime/isxdigit/test1/test1.cpp + c_runtime/llabs/test1/test1.cpp + c_runtime/log/test1/test1.cpp + c_runtime/log10/test1/test1.cpp + c_runtime/log10f/test1/test1.cpp + c_runtime/log2/test1/test1.cpp + c_runtime/log2f/test1/test1.cpp + c_runtime/logf/test1/test1.cpp + c_runtime/malloc/test1/test1.cpp + c_runtime/malloc/test2/test2.cpp + c_runtime/memchr/test1/test1.cpp + c_runtime/memcmp/test1/test1.cpp + c_runtime/memcpy/test1/test1.cpp + c_runtime/memmove/test1/test1.cpp + c_runtime/memset/test1/test1.cpp + c_runtime/modf/test1/test1.cpp + c_runtime/modff/test1/test1.cpp + c_runtime/pow/test1/test1.cpp + c_runtime/powf/test1/test1.cpp + c_runtime/printf/test1/test1.cpp + c_runtime/printf/test10/test10.cpp + c_runtime/printf/test11/test11.cpp + c_runtime/printf/test12/test12.cpp + c_runtime/printf/test13/test13.cpp + c_runtime/printf/test14/test14.cpp + c_runtime/printf/test15/test15.cpp + c_runtime/printf/test16/test16.cpp + c_runtime/printf/test17/test17.cpp + c_runtime/printf/test18/test18.cpp + c_runtime/printf/test19/test19.cpp + c_runtime/printf/test2/test2.cpp + c_runtime/printf/test3/test3.cpp + c_runtime/printf/test4/test4.cpp + c_runtime/printf/test5/test5.cpp + c_runtime/printf/test6/test6.cpp + c_runtime/printf/test7/test7.cpp + c_runtime/printf/test8/test8.cpp + c_runtime/printf/test9/test9.cpp + c_runtime/qsort/test1/test1.cpp + c_runtime/qsort/test2/test2.cpp + c_runtime/rand_srand/test1/test1.cpp + c_runtime/realloc/test1/test1.cpp + c_runtime/scalbn/test1/test1.cpp + c_runtime/scalbnf/test1/test1.cpp + c_runtime/sin/test1/test1.cpp + c_runtime/sinf/test1/test1.cpp + c_runtime/sinh/test1/test1.cpp + c_runtime/sinhf/test1/test1.cpp + c_runtime/sprintf_s/test1/test1.cpp + c_runtime/sprintf_s/test10/test10.cpp + c_runtime/sprintf_s/test11/test11.cpp + c_runtime/sprintf_s/test12/test12.cpp + c_runtime/sprintf_s/test13/test13.cpp + c_runtime/sprintf_s/test14/test14.cpp + c_runtime/sprintf_s/test15/test15.cpp + c_runtime/sprintf_s/test16/test16.cpp + c_runtime/sprintf_s/test17/test17.cpp + c_runtime/sprintf_s/test18/test18.cpp + c_runtime/sprintf_s/test19/test19.cpp + c_runtime/sprintf_s/test2/test2.cpp + c_runtime/sprintf_s/test3/test3.cpp + c_runtime/sprintf_s/test4/test4.cpp + c_runtime/sprintf_s/test6/test6.cpp + c_runtime/sprintf_s/test7/test7.cpp + c_runtime/sprintf_s/test8/test8.cpp + c_runtime/sprintf_s/test9/test9.cpp + c_runtime/sqrt/test1/test1.cpp + c_runtime/sqrtf/test1/test1.cpp + c_runtime/sscanf_s/test1/test1.cpp + c_runtime/sscanf_s/test10/test10.cpp + c_runtime/sscanf_s/test11/test11.cpp + c_runtime/sscanf_s/test12/test12.cpp + c_runtime/sscanf_s/test13/test13.cpp + c_runtime/sscanf_s/test14/test14.cpp + c_runtime/sscanf_s/test15/test15.cpp + c_runtime/sscanf_s/test16/test16.cpp + c_runtime/sscanf_s/test17/test17.cpp + c_runtime/sscanf_s/test2/test2.cpp + c_runtime/sscanf_s/test3/test3.cpp + c_runtime/sscanf_s/test4/test4.cpp + c_runtime/sscanf_s/test5/test5.cpp + c_runtime/sscanf_s/test6/test6.cpp + c_runtime/sscanf_s/test7/test7.cpp + c_runtime/sscanf_s/test8/test8.cpp + c_runtime/sscanf_s/test9/test9.cpp + c_runtime/strcat/test1/test1.cpp + c_runtime/strchr/test1/test1.cpp + c_runtime/strcmp/test1/test1.cpp + c_runtime/strcpy/test1/test1.cpp + c_runtime/strcspn/test1/test1.cpp + c_runtime/strlen/test1/test1.cpp + c_runtime/strncat/test1/test1.cpp + c_runtime/strncmp/test1/test1.cpp + c_runtime/strncpy/test1/test1.cpp + c_runtime/strpbrk/test1/test1.cpp + c_runtime/strrchr/test1/test1.cpp + c_runtime/strspn/test1/test1.cpp + c_runtime/strstr/test1/test1.cpp + c_runtime/strtod/test1/test1.cpp + c_runtime/strtod/test2/test2.cpp + c_runtime/strtok/test1/test1.cpp + c_runtime/strtoul/test1/test1.cpp + c_runtime/swprintf/test1/test1.cpp + c_runtime/swprintf/test10/test10.cpp + c_runtime/swprintf/test11/test11.cpp + c_runtime/swprintf/test12/test12.cpp + c_runtime/swprintf/test13/test13.cpp + c_runtime/swprintf/test14/test14.cpp + c_runtime/swprintf/test15/test15.cpp + c_runtime/swprintf/test16/test16.cpp + c_runtime/swprintf/test17/test17.cpp + c_runtime/swprintf/test18/test18.cpp + c_runtime/swprintf/test19/test19.cpp + c_runtime/swprintf/test2/test2.cpp + c_runtime/swprintf/test3/test3.cpp + c_runtime/swprintf/test4/test4.cpp + c_runtime/swprintf/test6/test6.cpp + c_runtime/swprintf/test7/test7.cpp + c_runtime/swprintf/test8/test8.cpp + c_runtime/swprintf/test9/test9.cpp + c_runtime/swscanf/test1/test1.cpp + c_runtime/swscanf/test10/test10.cpp + c_runtime/swscanf/test11/test11.cpp + c_runtime/swscanf/test12/test12.cpp + c_runtime/swscanf/test13/test13.cpp + c_runtime/swscanf/test14/test14.cpp + c_runtime/swscanf/test15/test15.cpp + c_runtime/swscanf/test16/test16.cpp + c_runtime/swscanf/test17/test17.cpp + c_runtime/swscanf/test2/test2.cpp + c_runtime/swscanf/test3/test3.cpp + c_runtime/swscanf/test4/test4.cpp + c_runtime/swscanf/test5/test5.cpp + c_runtime/swscanf/test6/test6.cpp + c_runtime/swscanf/test7/test7.cpp + c_runtime/swscanf/test8/test8.cpp + c_runtime/swscanf/test9/test9.cpp + c_runtime/tan/test1/test1.cpp + c_runtime/tanf/test1/test1.cpp + c_runtime/tanh/test1/test1.cpp + c_runtime/tanhf/test1/test1.cpp + c_runtime/time/test1/test1.cpp + c_runtime/tolower/test1/test1.cpp + c_runtime/toupper/test1/test1.cpp + c_runtime/towlower/test1/test1.cpp + c_runtime/towupper/test1/test1.cpp + c_runtime/vfprintf/test1/test1.cpp + c_runtime/vfprintf/test10/test10.cpp + c_runtime/vfprintf/test11/test11.cpp + c_runtime/vfprintf/test12/test12.cpp + c_runtime/vfprintf/test13/test13.cpp + c_runtime/vfprintf/test14/test14.cpp + c_runtime/vfprintf/test15/test15.cpp + c_runtime/vfprintf/test16/test16.cpp + c_runtime/vfprintf/test17/test17.cpp + c_runtime/vfprintf/test18/test18.cpp + c_runtime/vfprintf/test19/test19.cpp + c_runtime/vfprintf/test2/test2.cpp + c_runtime/vfprintf/test3/test3.cpp + c_runtime/vfprintf/test4/test4.cpp + c_runtime/vfprintf/test5/test5.cpp + c_runtime/vfprintf/test6/test6.cpp + c_runtime/vfprintf/test7/test7.cpp + c_runtime/vfprintf/test8/test8.cpp + c_runtime/vfprintf/test9/test9.cpp + #c_runtime/vprintf/test1/test1.cpp + c_runtime/vprintf/test10/test10.cpp + c_runtime/vprintf/test11/test11.cpp + c_runtime/vprintf/test12/test12.cpp + c_runtime/vprintf/test13/test13.cpp + c_runtime/vprintf/test14/test14.cpp + c_runtime/vprintf/test15/test15.cpp + c_runtime/vprintf/test16/test16.cpp + c_runtime/vprintf/test17/test17.cpp + c_runtime/vprintf/test18/test18.cpp + c_runtime/vprintf/test19/test19.cpp + c_runtime/vprintf/test2/test2.cpp + c_runtime/vprintf/test3/test3.cpp + c_runtime/vprintf/test4/test4.cpp + c_runtime/vprintf/test5/test5.cpp + c_runtime/vprintf/test6/test6.cpp + c_runtime/vprintf/test7/test7.cpp + c_runtime/vprintf/test8/test8.cpp + c_runtime/vprintf/test9/test9.cpp + c_runtime/vsprintf/test1/test1.cpp + c_runtime/vsprintf/test10/test10.cpp + c_runtime/vsprintf/test11/test11.cpp + c_runtime/vsprintf/test12/test12.cpp + c_runtime/vsprintf/test13/test13.cpp + c_runtime/vsprintf/test14/test14.cpp + c_runtime/vsprintf/test15/test15.cpp + c_runtime/vsprintf/test16/test16.cpp + c_runtime/vsprintf/test17/test17.cpp + c_runtime/vsprintf/test18/test18.cpp + c_runtime/vsprintf/test19/test19.cpp + c_runtime/vsprintf/test2/test2.cpp + c_runtime/vsprintf/test3/test3.cpp + c_runtime/vsprintf/test4/test4.cpp + c_runtime/vsprintf/test6/test6.cpp + c_runtime/vsprintf/test7/test7.cpp + c_runtime/vsprintf/test8/test8.cpp + c_runtime/vsprintf/test9/test9.cpp + c_runtime/vswprintf/test1/test1.cpp + c_runtime/vswprintf/test10/test10.cpp + c_runtime/vswprintf/test11/test11.cpp + c_runtime/vswprintf/test12/test12.cpp + c_runtime/vswprintf/test13/test13.cpp + c_runtime/vswprintf/test14/test14.cpp + c_runtime/vswprintf/test15/test15.cpp + c_runtime/vswprintf/test16/test16.cpp + c_runtime/vswprintf/test17/test17.cpp + c_runtime/vswprintf/test18/test18.cpp + c_runtime/vswprintf/test19/test19.cpp + c_runtime/vswprintf/test2/test2.cpp + c_runtime/vswprintf/test3/test3.cpp + c_runtime/vswprintf/test4/test4.cpp + c_runtime/vswprintf/test6/test6.cpp + c_runtime/vswprintf/test7/test7.cpp + c_runtime/vswprintf/test8/test8.cpp + c_runtime/vswprintf/test9/test9.cpp + c_runtime/wcscat/test1/test1.cpp + c_runtime/wcschr/test1/test1.cpp + c_runtime/wcscmp/test1/test1.cpp + c_runtime/wcscpy/test1/test1.cpp + c_runtime/wcslen/test1/test1.cpp + c_runtime/wcsncmp/test1/test1.cpp + c_runtime/wcsncpy/test1/test1.cpp + c_runtime/wcspbrk/test1/test1.cpp + c_runtime/wcsrchr/test1/test1.cpp + c_runtime/wcsstr/test1/test1.cpp + c_runtime/wcstod/test1/test1.cpp + c_runtime/wcstod/test2/test2.cpp + c_runtime/wcstok/test1/test1.cpp + c_runtime/wcstoul/test1/test1.cpp + c_runtime/wcstoul/test2/test2.cpp + c_runtime/wcstoul/test3/test3.cpp + c_runtime/wcstoul/test4/test4.cpp + c_runtime/wcstoul/test5/test5.cpp + c_runtime/wcstoul/test6/test6.cpp + c_runtime/wprintf/test1/test1.cpp + c_runtime/wprintf/test2/test2.cpp + c_runtime/_alloca/test1/test1.cpp + c_runtime/_fdopen/test1/test1.cpp + c_runtime/_finite/test1/test1.cpp + c_runtime/_finitef/test1/test1.cpp + #c_runtime/_gcvt/test1/_gcvt.cpp + #c_runtime/_gcvt/test2/test2.cpp + c_runtime/_isnan/test1/test1.cpp + c_runtime/_isnanf/test1/test1.cpp + c_runtime/_itow/test1/test1.cpp + c_runtime/_putenv/test1/test1.cpp + c_runtime/_putenv/test2/test2.cpp + c_runtime/_putenv/test3/test3.cpp + c_runtime/_putenv/test4/test4.cpp + c_runtime/_rotl/test1/test1.cpp + c_runtime/_rotr/test1/test1.cpp + c_runtime/_snprintf_s/test1/test1.cpp + c_runtime/_snprintf_s/test10/test10.cpp + c_runtime/_snprintf_s/test11/test11.cpp + c_runtime/_snprintf_s/test12/test12.cpp + c_runtime/_snprintf_s/test13/test13.cpp + c_runtime/_snprintf_s/test14/test14.cpp + c_runtime/_snprintf_s/test15/test15.cpp + c_runtime/_snprintf_s/test16/test16.cpp + c_runtime/_snprintf_s/test17/test17.cpp + c_runtime/_snprintf_s/test18/test18.cpp + c_runtime/_snprintf_s/test19/test19.cpp + c_runtime/_snprintf_s/test2/test2.cpp + c_runtime/_snprintf_s/test3/test3.cpp + c_runtime/_snprintf_s/test4/test4.cpp + c_runtime/_snprintf_s/test6/test6.cpp + c_runtime/_snprintf_s/test7/test7.cpp + c_runtime/_snprintf_s/test8/test8.cpp + c_runtime/_snprintf_s/test9/test9.cpp + c_runtime/_snwprintf_s/test1/test1.cpp + c_runtime/_snwprintf_s/test10/test10.cpp + c_runtime/_snwprintf_s/test11/test11.cpp + c_runtime/_snwprintf_s/test12/test12.cpp + c_runtime/_snwprintf_s/test13/test13.cpp + c_runtime/_snwprintf_s/test14/test14.cpp + c_runtime/_snwprintf_s/test15/test15.cpp + c_runtime/_snwprintf_s/test16/test16.cpp + c_runtime/_snwprintf_s/test17/test17.cpp + c_runtime/_snwprintf_s/test18/test18.cpp + c_runtime/_snwprintf_s/test19/test19.cpp + c_runtime/_snwprintf_s/test2/test2.cpp + c_runtime/_snwprintf_s/test3/test3.cpp + c_runtime/_snwprintf_s/test4/test4.cpp + c_runtime/_snwprintf_s/test6/test6.cpp + c_runtime/_snwprintf_s/test7/test7.cpp + c_runtime/_snwprintf_s/test8/test8.cpp + c_runtime/_snwprintf_s/test9/test9.cpp + c_runtime/_stricmp/test1/test1.cpp + c_runtime/_strnicmp/test1/test1.cpp + c_runtime/_vsnprintf_s/test1/test1.cpp + c_runtime/_vsnprintf_s/test10/test10.cpp + c_runtime/_vsnprintf_s/test11/test11.cpp + c_runtime/_vsnprintf_s/test12/test12.cpp + c_runtime/_vsnprintf_s/test13/test13.cpp + c_runtime/_vsnprintf_s/test14/test14.cpp + c_runtime/_vsnprintf_s/test15/test15.cpp + c_runtime/_vsnprintf_s/test16/test16.cpp + c_runtime/_vsnprintf_s/test17/test17.cpp + c_runtime/_vsnprintf_s/test18/test18.cpp + c_runtime/_vsnprintf_s/test19/test19.cpp + c_runtime/_vsnprintf_s/test2/test2.cpp + c_runtime/_vsnprintf_s/test3/test3.cpp + c_runtime/_vsnprintf_s/test4/test4.cpp + c_runtime/_vsnprintf_s/test6/test6.cpp + c_runtime/_vsnprintf_s/test7/test7.cpp + c_runtime/_vsnprintf_s/test8/test8.cpp + c_runtime/_vsnprintf_s/test9/test9.cpp + c_runtime/_vsnwprintf_s/test1/test1.cpp + c_runtime/_vsnwprintf_s/test10/test10.cpp + c_runtime/_vsnwprintf_s/test11/test11.cpp + c_runtime/_vsnwprintf_s/test12/test12.cpp + c_runtime/_vsnwprintf_s/test13/test13.cpp + c_runtime/_vsnwprintf_s/test14/test14.cpp + c_runtime/_vsnwprintf_s/test15/test15.cpp + c_runtime/_vsnwprintf_s/test16/test16.cpp + c_runtime/_vsnwprintf_s/test17/test17.cpp + c_runtime/_vsnwprintf_s/test18/test18.cpp + c_runtime/_vsnwprintf_s/test19/test19.cpp + c_runtime/_vsnwprintf_s/test2/test2.cpp + c_runtime/_vsnwprintf_s/test3/test3.cpp + c_runtime/_vsnwprintf_s/test4/test4.cpp + c_runtime/_vsnwprintf_s/test6/test6.cpp + c_runtime/_vsnwprintf_s/test7/test7.cpp + c_runtime/_vsnwprintf_s/test8/test8.cpp + c_runtime/_vsnwprintf_s/test9/test9.cpp + c_runtime/_wcsicmp/test1/test1.cpp + c_runtime/_wcslwr/test1/test1.cpp + c_runtime/_wcsnicmp/test1/test1.cpp + c_runtime/_wfopen/test1/test1.cpp + c_runtime/_wfopen/test2/test2.cpp + c_runtime/_wfopen/test3/test3.cpp + c_runtime/_wfopen/test4/test4.cpp + c_runtime/_wfopen/test5/test5.cpp + c_runtime/_wfopen/test6/test6.cpp + c_runtime/_wfopen/test7/test7.cpp + c_runtime/_wtoi/test1/test1.cpp + c_runtime/__iscsym/test1/__iscsym.cpp + #debug_api/DebugBreak/test1/test1.cpp + debug_api/OutputDebugStringA/test1/helper.cpp + debug_api/OutputDebugStringA/test1/test1.cpp + debug_api/OutputDebugStringW/test1/test1.cpp + #debug_api/WriteProcessMemory/test1/helper.cpp + #debug_api/WriteProcessMemory/test1/test1.cpp + #debug_api/WriteProcessMemory/test3/helper.cpp + #debug_api/WriteProcessMemory/test3/test3.cpp + #debug_api/WriteProcessMemory/test4/helper.cpp + #debug_api/WriteProcessMemory/test4/test4.cpp + #exception_handling/pal_except/test1/test1.cpp + #exception_handling/pal_except/test2/test2.cpp + #exception_handling/pal_except/test3/test3.cpp + #exception_handling/pal_except/test4/test4.cpp + #exception_handling/pal_except/test5/test5.cpp + #exception_handling/pal_except/test6/test6.cpp + #exception_handling/pal_except/test7/test7.cpp + #exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp + #exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp + #exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp + #exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp + #exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp + #exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp + #exception_handling/pal_finally/test1/pal_finally.cpp + #exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp + #exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp + #exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp + #exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp + #exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp + #exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp + exception_handling/RaiseException/test1/test1.cpp + exception_handling/RaiseException/test2/test2.cpp + exception_handling/RaiseException/test3/test.cpp + filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp + filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp + #filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp + filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp + filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp + filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp + filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp + filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp + filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp + filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp +# filemapping_memmgt/FreeLibrary/test1/dlltest.cpp + filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp + filemapping_memmgt/FreeLibrary/test2/test2.cpp +# filemapping_memmgt/FreeLibraryAndExitThread/test1/dlltest.cpp + filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp + filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp + filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp + filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp + filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp + filemapping_memmgt/GetProcAddress/test1/test1.cpp +# filemapping_memmgt/GetProcAddress/test1/testlib.cpp + filemapping_memmgt/GetProcAddress/test2/test2.cpp +# filemapping_memmgt/GetProcAddress/test2/testlib.cpp + filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp + filemapping_memmgt/LocalFree/test1/LocalFree.cpp + filemapping_memmgt/LocalFree/test2/LocalFree.cpp + filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp + filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp + filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp + filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp + filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp + filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp + filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp + filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp + filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp + filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/ProbeMemory_neg.cpp + filemapping_memmgt/ProbeMemory/test1/ProbeMemory.cpp + filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp + filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp + filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp + filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp + filemapping_memmgt/VirtualAlloc/test22/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp + filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp + filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp + filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp + filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp + filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp + filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp + filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp + filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp + filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp + filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp + filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp + file_io/CopyFileA/test1/CopyFileA.cpp + file_io/CopyFileA/test2/test2.cpp + file_io/CopyFileA/test3/test3.cpp + file_io/CopyFileA/test4/test4.cpp + file_io/CopyFileW/test1/CopyFileW.cpp + file_io/CopyFileW/test2/test2.cpp + file_io/CopyFileW/test3/test3.cpp + file_io/CreateFileA/test1/CreateFileA.cpp + file_io/CreateFileW/test1/CreateFileW.cpp + file_io/DeleteFileA/test1/DeleteFileA.cpp + file_io/DeleteFileW/test1/DeleteFileW.cpp + file_io/errorpathnotfound/test1/test1.cpp + file_io/errorpathnotfound/test2/test2.cpp + file_io/FILECanonicalizePath/FILECanonicalizePath.cpp + file_io/FindClose/test1/FindClose.cpp + file_io/FindFirstFileA/test1/FindFirstFileA.cpp + file_io/FindFirstFileW/test1/FindFirstFileW.cpp + file_io/FindNextFileA/test1/FindNextFileA.cpp + file_io/FindNextFileA/test2/findnextfilea.cpp + file_io/FindNextFileW/test1/FindNextFileW.cpp + file_io/FindNextFileW/test2/findnextfilew.cpp + file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp + file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp + file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp + file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp + file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp + file_io/GetFileAttributesExW/test1/test1.cpp + file_io/GetFileAttributesExW/test2/test2.cpp + file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp + file_io/GetFileSize/test1/GetFileSize.cpp + file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp + file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp + file_io/GetFullPathNameA/test2/test2.cpp + file_io/GetFullPathNameA/test3/test3.cpp + file_io/GetFullPathNameA/test4/test4.cpp + file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp + file_io/GetFullPathNameW/test2/test2.cpp + file_io/GetFullPathNameW/test3/test3.cpp + file_io/GetFullPathNameW/test4/test4.cpp + file_io/GetStdHandle/test1/GetStdHandle.cpp + file_io/GetStdHandle/test2/GetStdHandle.cpp + file_io/GetSystemTime/test1/test.cpp + file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp + file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp + file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp + file_io/GetTempFileNameA/test3/gettempfilenamea.cpp + file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp + file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp + file_io/GetTempFileNameW/test3/gettempfilenamew.cpp + file_io/gettemppatha/test1/gettemppatha.cpp + file_io/GetTempPathW/test1/GetTempPathW.cpp + file_io/MoveFileExA/test1/MoveFileExA.cpp + file_io/MoveFileExW/test1/MoveFileExW.cpp + file_io/ReadFile/test1/ReadFile.cpp + file_io/ReadFile/test2/ReadFile.cpp + file_io/ReadFile/test3/ReadFile.cpp + file_io/ReadFile/test4/readfile.cpp + file_io/SearchPathW/test1/SearchPathW.cpp + file_io/SetEndOfFile/test1/SetEndOfFile.cpp + file_io/SetEndOfFile/test2/SetEndOfFile.cpp + file_io/SetEndOfFile/test3/SetEndOfFile.cpp + file_io/SetEndOfFile/test4/setendoffile.cpp + file_io/SetEndOfFile/test5/test5.cpp + file_io/SetFilePointer/test1/SetFilePointer.cpp + file_io/SetFilePointer/test2/SetFilePointer.cpp + file_io/SetFilePointer/test3/SetFilePointer.cpp + file_io/SetFilePointer/test4/SetFilePointer.cpp + file_io/SetFilePointer/test5/SetFilePointer.cpp + file_io/SetFilePointer/test6/SetFilePointer.cpp + file_io/SetFilePointer/test7/SetFilePointer.cpp + file_io/WriteFile/test1/WriteFile.cpp + file_io/WriteFile/test2/WriteFile.cpp + file_io/WriteFile/test3/WriteFile.cpp + file_io/WriteFile/test4/writefile.cpp + file_io/WriteFile/test5/writefile.cpp + loader/LoadLibraryA/test1/LoadLibraryA.cpp + loader/LoadLibraryA/test2/LoadLibraryA.cpp + loader/LoadLibraryA/test3/loadlibrarya.cpp + loader/LoadLibraryA/test5/loadlibrarya.cpp + #loader/LoadLibraryA/test6/dlltest.cpp + #loader/LoadLibraryA/test6/loadlibrarya.cpp + loader/LoadLibraryA/test7/LoadLibraryA.cpp + #loader/LoadLibraryA/test8/dlltest.cpp + #loader/LoadLibraryA/test8/loadlibrarya.cpp + loader/LoadLibraryW/test1/LoadLibraryW.cpp + loader/LoadLibraryW/test2/loadlibraryw.cpp + loader/LoadLibraryW/test3/loadlibraryw.cpp + loader/LoadLibraryW/test5/loadlibraryw.cpp + #locale_info/CompareStringA/test1/test1.cpp + #locale_info/CompareStringW/test1/test1.cpp + locale_info/GetACP/test1/test1.cpp + #locale_info/GetLocaleInfoW/test1/test1.cpp + #locale_info/GetLocaleInfoW/test2/test2.cpp + locale_info/MultiByteToWideChar/test1/test1.cpp + locale_info/MultiByteToWideChar/test2/test2.cpp + locale_info/MultiByteToWideChar/test3/test3.cpp + locale_info/MultiByteToWideChar/test4/test4.cpp + locale_info/WideCharToMultiByte/test1/test1.cpp + locale_info/WideCharToMultiByte/test2/test2.cpp + locale_info/WideCharToMultiByte/test3/test3.cpp + locale_info/WideCharToMultiByte/test4/test4.cpp + locale_info/WideCharToMultiByte/test5/test5.cpp + miscellaneous/CGroup/test1/test.cpp + miscellaneous/CloseHandle/test1/test.cpp + miscellaneous/CloseHandle/test2/test.cpp + miscellaneous/CreatePipe/test1/test1.cpp + miscellaneous/FlushInstructionCache/test1/test1.cpp + miscellaneous/FormatMessageW/test1/test.cpp + miscellaneous/FormatMessageW/test2/test.cpp + miscellaneous/FormatMessageW/test3/test.cpp + miscellaneous/FormatMessageW/test4/test.cpp + miscellaneous/FormatMessageW/test5/test.cpp + miscellaneous/FormatMessageW/test6/test.cpp + miscellaneous/FreeEnvironmentStringsW/test1/test.cpp + miscellaneous/FreeEnvironmentStringsW/test2/test.cpp + miscellaneous/GetCommandLineW/test1/test.cpp + miscellaneous/GetEnvironmentStringsW/test1/test.cpp + miscellaneous/GetEnvironmentVariableA/test1/test.cpp + miscellaneous/GetEnvironmentVariableA/test2/test.cpp + miscellaneous/GetEnvironmentVariableA/test3/test.cpp + miscellaneous/GetEnvironmentVariableA/test4/test.cpp + miscellaneous/GetEnvironmentVariableA/test5/test5.cpp + miscellaneous/GetEnvironmentVariableA/test6/test6.cpp + miscellaneous/GetEnvironmentVariableW/test1/test.cpp + miscellaneous/GetEnvironmentVariableW/test2/test.cpp + miscellaneous/GetEnvironmentVariableW/test3/test.cpp + miscellaneous/GetEnvironmentVariableW/test4/test.cpp + miscellaneous/GetEnvironmentVariableW/test5/test5.cpp + miscellaneous/GetEnvironmentVariableW/test6/test6.cpp + miscellaneous/GetLastError/test1/test.cpp + miscellaneous/GetSystemInfo/test1/test.cpp + miscellaneous/GetTickCount/test1/test.cpp + miscellaneous/GlobalMemoryStatusEx/test1/test.cpp + miscellaneous/InterlockedBit/test1/test.cpp + miscellaneous/InterlockedBit/test2/test.cpp + miscellaneous/InterlockedCompareExchange/test1/test.cpp + miscellaneous/InterlockedCompareExchange/test2/test.cpp + miscellaneous/InterlockedCompareExchange64/test1/test.cpp + miscellaneous/InterlockedCompareExchange64/test2/test.cpp + miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp + miscellaneous/InterlockedDecrement/test1/test.cpp + miscellaneous/InterlockedDecrement/test2/test.cpp + miscellaneous/InterlockedDecrement64/test1/test.cpp + miscellaneous/InterlockedDecrement64/test2/test.cpp + miscellaneous/InterlockedExchange/test1/test.cpp + miscellaneous/InterlockedExchange64/test1/test.cpp + miscellaneous/InterLockedExchangeAdd/test1/test.cpp + miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp + miscellaneous/InterlockedIncrement/test1/test.cpp + miscellaneous/InterlockedIncrement/test2/test.cpp + miscellaneous/InterlockedIncrement64/test1/test.cpp + miscellaneous/InterlockedIncrement64/test2/test.cpp + #miscellaneous/IsBadCodePtr/test1/test1.cpp + #miscellaneous/IsBadReadPtr/test1/test.cpp + #miscellaneous/IsBadWritePtr/test1/test.cpp + #miscellaneous/IsBadWritePtr/test2/test2.cpp + #miscellaneous/IsBadWritePtr/test3/test3.cpp + #miscellaneous/MessageBoxW/test1/test.cpp + #miscellaneous/MessageBoxW/test2/test.cpp + miscellaneous/queryperformancecounter/test1/test1.cpp + miscellaneous/queryperformancefrequency/test1/test1.cpp + miscellaneous/SetEnvironmentVariableA/test1/test1.cpp + miscellaneous/SetEnvironmentVariableA/test2/test2.cpp + miscellaneous/SetEnvironmentVariableA/test3/test3.cpp + miscellaneous/SetEnvironmentVariableA/test4/test4.cpp + miscellaneous/SetEnvironmentVariableW/test1/test.cpp + miscellaneous/SetEnvironmentVariableW/test2/test.cpp + miscellaneous/SetEnvironmentVariableW/test3/test3.cpp + miscellaneous/SetEnvironmentVariableW/test4/test4.cpp + miscellaneous/SetLastError/test1/test.cpp + miscellaneous/_i64tow/test1/test1.cpp + pal_specific/PAL_errno/test1/PAL_errno.cpp + pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp +# pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp + #pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp + #pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp + #pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp + pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp + pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp +# pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp +# pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp + samples/test1/test.cpp + samples/test2/test.cpp + threading/CreateEventW/test1/test1.cpp + threading/CreateEventW/test2/test2.cpp + threading/CreateEventW/test3/test3.cpp + threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp + threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp + threading/CreateProcessW/test1/childProcess.cpp + threading/CreateProcessW/test1/parentProcess.cpp + threading/CreateProcessW/test2/childprocess.cpp + threading/CreateProcessW/test2/parentprocess.cpp + threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp + threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp + threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp + threading/CreateThread/test1/test1.cpp + threading/CreateThread/test2/test2.cpp + threading/CreateThread/test3/test3.cpp + threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp + threading/CriticalSectionFunctions/test2/test2.cpp + threading/CriticalSectionFunctions/test3/test3.cpp + threading/CriticalSectionFunctions/test4/test4.cpp + threading/CriticalSectionFunctions/test5/test5.cpp + threading/CriticalSectionFunctions/test6/test6.cpp + threading/CriticalSectionFunctions/test7/test7.cpp + threading/CriticalSectionFunctions/test8/test8.cpp + threading/DuplicateHandle/test1/test1.cpp + threading/DuplicateHandle/test10/test10.cpp + threading/DuplicateHandle/test11/childprocess.cpp + threading/DuplicateHandle/test11/test11.cpp + threading/DuplicateHandle/test12/test12.cpp + threading/DuplicateHandle/test2/test2.cpp + threading/DuplicateHandle/test3/test3.cpp + threading/DuplicateHandle/test4/test4.cpp + threading/DuplicateHandle/test5/test5.cpp + threading/DuplicateHandle/test6/test6.cpp + threading/DuplicateHandle/test7/test7.cpp + threading/DuplicateHandle/test8/test8.cpp +# threading/DuplicateHandle/test9/test9.cpp + threading/ExitProcess/test1/ExitProcess.cpp + threading/ExitProcess/test2/test2.cpp + threading/ExitProcess/test3/test3.cpp + threading/ExitThread/test1/test1.cpp + threading/ExitThread/test2/childprocess.cpp + threading/ExitThread/test2/test2.cpp + threading/GetCurrentProcess/test1/process.cpp + threading/GetCurrentProcessId/test1/processId.cpp + threading/GetCurrentThread/test1/thread.cpp + threading/GetCurrentThread/test2/test2.cpp + threading/GetCurrentThreadId/test1/threadId.cpp + threading/GetExitCodeProcess/test1/childProcess.cpp + threading/GetExitCodeProcess/test1/test1.cpp + threading/GetProcessTimes/test2/test2.cpp + threading/GetThreadTimes/test1/test1.cpp + threading/NamedMutex/test1/namedmutex.cpp + threading/NamedMutex/test1/nopal.cpp + threading/OpenEventW/test1/test1.cpp + threading/OpenEventW/test2/test2.cpp + threading/OpenEventW/test3/childprocess.cpp + threading/OpenEventW/test3/test3.cpp + threading/OpenEventW/test4/test4.cpp + threading/OpenEventW/test5/test5.cpp + threading/OpenProcess/test1/childProcess.cpp + threading/OpenProcess/test1/test1.cpp + threading/QueryThreadCycleTime/test1/test1.cpp + threading/QueueUserAPC/test1/test1.cpp + threading/QueueUserAPC/test2/test2.cpp + threading/QueueUserAPC/test3/test3.cpp + threading/QueueUserAPC/test4/test4.cpp + threading/QueueUserAPC/test5/test5.cpp + threading/QueueUserAPC/test6/test6.cpp + threading/QueueUserAPC/test7/test7.cpp + threading/ReleaseMutex/test3/ReleaseMutex.cpp + threading/releasesemaphore/test1/test.cpp + threading/ResetEvent/test1/test1.cpp + threading/ResetEvent/test2/test2.cpp + threading/ResetEvent/test3/test3.cpp + threading/ResetEvent/test4/test4.cpp + threading/ResumeThread/test1/test1.cpp + threading/SetErrorMode/test1/test1.cpp + threading/SetEvent/test1/test1.cpp + threading/SetEvent/test2/test2.cpp + threading/SetEvent/test3/test3.cpp + threading/SetEvent/test4/test4.cpp + threading/SignalObjectAndWait/SignalObjectAndWaitTest.cpp + threading/Sleep/test1/Sleep.cpp + threading/Sleep/test2/sleep.cpp + threading/SleepEx/test1/test1.cpp + threading/SleepEx/test2/test2.cpp + threading/SwitchToThread/test1/test1.cpp + threading/TerminateProcess/test1/TerminateProcess.cpp + threading/ThreadPriority/test1/ThreadPriority.cpp + threading/WaitForMultipleObjects/test1/test1.cpp + threading/WaitForMultipleObjectsEx/test1/test1.cpp + threading/WaitForMultipleObjectsEx/test2/test2.cpp + threading/WaitForMultipleObjectsEx/test3/test3.cpp + threading/WaitForMultipleObjectsEx/test4/test4.cpp + threading/WaitForMultipleObjectsEx/test5/helper.cpp + threading/WaitForMultipleObjectsEx/test5/test5.cpp + threading/WaitForMultipleObjectsEx/test6/child6.cpp + threading/WaitForMultipleObjectsEx/test6/test6.cpp + threading/WaitForSingleObject/test1/test1.cpp + threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp + threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp + threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp + threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp + threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp + threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp + threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp + threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp + threading/YieldProcessor/test1/test1.cpp + +) + +add_dependencies(paltests coreclrpal) + +target_link_libraries(paltests + ${COMMON_TEST_LIBRARIES} +) + +_install (TARGETS paltests DESTINATION paltests) +_install (PROGRAMS runpaltests.sh runpaltestshelix.sh DESTINATION paltests) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/CMakeLists.txt deleted file mode 100644 index 5dab9502848..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/CMakeLists.txt +++ /dev/null @@ -1,168 +0,0 @@ -add_subdirectory(abs) -add_subdirectory(acos) -add_subdirectory(acosf) -add_subdirectory(acosh) -add_subdirectory(acoshf) -add_subdirectory(asin) -add_subdirectory(asinf) -add_subdirectory(asinh) -add_subdirectory(asinhf) -add_subdirectory(atan) -add_subdirectory(atan2) -add_subdirectory(atan2f) -add_subdirectory(atanf) -add_subdirectory(atanh) -add_subdirectory(atanhf) -add_subdirectory(atof) -add_subdirectory(atoi) -add_subdirectory(bsearch) -add_subdirectory(cbrt) -add_subdirectory(cbrtf) -add_subdirectory(ceil) -add_subdirectory(ceilf) -add_subdirectory(cos) -add_subdirectory(cosf) -add_subdirectory(cosh) -add_subdirectory(coshf) - -add_subdirectory(errno) -add_subdirectory(exit) -add_subdirectory(exp) -add_subdirectory(expf) -add_subdirectory(fabs) -add_subdirectory(fabsf) -add_subdirectory(fclose) -add_subdirectory(ferror) -add_subdirectory(fflush) -add_subdirectory(fgets) -add_subdirectory(floor) -add_subdirectory(floorf) -add_subdirectory(fma) -add_subdirectory(fmaf) -add_subdirectory(fmod) -add_subdirectory(fmodf) -add_subdirectory(fopen) -add_subdirectory(fprintf) -add_subdirectory(fputs) -add_subdirectory(fread) -add_subdirectory(free) -add_subdirectory(fseek) -add_subdirectory(ftell) -add_subdirectory(fwprintf) -add_subdirectory(fwrite) -add_subdirectory(getenv) -add_subdirectory(ilogb) -add_subdirectory(ilogbf) -add_subdirectory(isalnum) -add_subdirectory(isalpha) -add_subdirectory(isdigit) -add_subdirectory(islower) -add_subdirectory(isprint) -add_subdirectory(isspace) -add_subdirectory(isupper) -add_subdirectory(iswdigit) -add_subdirectory(iswspace) -add_subdirectory(iswupper) -add_subdirectory(isxdigit) -add_subdirectory(llabs) -add_subdirectory(log) -add_subdirectory(log2) -add_subdirectory(log2f) -add_subdirectory(log10) -add_subdirectory(log10f) -add_subdirectory(logf) -add_subdirectory(malloc) -add_subdirectory(memchr) -add_subdirectory(memcmp) -add_subdirectory(memcpy) -add_subdirectory(memmove) -add_subdirectory(memset) -add_subdirectory(modf) -add_subdirectory(modff) -add_subdirectory(pow) -add_subdirectory(powf) -add_subdirectory(printf) -add_subdirectory(qsort) -add_subdirectory(rand_srand) -add_subdirectory(realloc) -add_subdirectory(scalbn) -add_subdirectory(scalbnf) -add_subdirectory(sin) -add_subdirectory(sinf) -add_subdirectory(sinh) -add_subdirectory(sinhf) -add_subdirectory(sprintf_s) -add_subdirectory(sqrt) -add_subdirectory(sqrtf) -add_subdirectory(sscanf_s) -add_subdirectory(strcat) -add_subdirectory(strchr) -add_subdirectory(strcmp) -add_subdirectory(strcpy) -add_subdirectory(strcspn) -add_subdirectory(strlen) -add_subdirectory(strncat) -add_subdirectory(strncmp) -add_subdirectory(strncpy) -add_subdirectory(strpbrk) -add_subdirectory(strrchr) -add_subdirectory(strspn) -add_subdirectory(strstr) -add_subdirectory(strtod) -add_subdirectory(strtok) -add_subdirectory(strtoul) -add_subdirectory(swprintf) -add_subdirectory(swscanf) -add_subdirectory(tan) -add_subdirectory(tanf) -add_subdirectory(tanh) -add_subdirectory(tanhf) -add_subdirectory(time) -add_subdirectory(tolower) -add_subdirectory(toupper) -add_subdirectory(towlower) -add_subdirectory(towupper) -add_subdirectory(vfprintf) -add_subdirectory(vprintf) -add_subdirectory(vsprintf) -add_subdirectory(vswprintf) -add_subdirectory(wcscat) -add_subdirectory(wcschr) -add_subdirectory(wcscmp) -add_subdirectory(wcscpy) -add_subdirectory(wcslen) -add_subdirectory(wcsncmp) -add_subdirectory(wcsncpy) -add_subdirectory(wcspbrk) -add_subdirectory(wcsrchr) -add_subdirectory(wcsstr) -add_subdirectory(wcstod) -add_subdirectory(wcstok) -add_subdirectory(wcstoul) -add_subdirectory(wprintf) -add_subdirectory(_alloca) -add_subdirectory(_fdopen) -add_subdirectory(_finite) -add_subdirectory(_finitef) - -# TODO: make this test compile -# add_subdirectory(_gcvt) - -add_subdirectory(_isnan) -add_subdirectory(_isnanf) -add_subdirectory(_itow) -add_subdirectory(_putenv) -add_subdirectory(_rotl) -add_subdirectory(_rotr) -add_subdirectory(_snprintf_s) -add_subdirectory(_snwprintf_s) -add_subdirectory(_stricmp) -add_subdirectory(_strnicmp) -add_subdirectory(_vsnprintf_s) -add_subdirectory(_vsnwprintf_s) -add_subdirectory(_wcsicmp) -add_subdirectory(_wcslwr) -add_subdirectory(_wcsnicmp) -add_subdirectory(_wfopen) -add_subdirectory(_wtoi) -add_subdirectory(__iscsym) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt deleted file mode 100644 index 431b99e4eb2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - __iscsym.cpp -) - -add_executable(paltest_iscsym_test1 - ${SOURCES} -) - -add_dependencies(paltest_iscsym_test1 coreclrpal) - -target_link_libraries(paltest_iscsym_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp index 497f281da12..9244c5f0a32 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime___iscsym_test1_paltest_iscsym_test1, "c_runtime/__iscsym/test1/paltest_iscsym_test1") { int err; int index; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/testinfo.dat deleted file mode 100644 index 7bf152d2cc7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/__iscsym/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = __iscsym -Name = Positive test for __iscsym to test letter, digit and underscore -TYPE = DEFAULT -EXE1 = __iscsym -Description -=Test the __iscsym to test letter, digit and underscore diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt deleted file mode 100644 index 41226ab10ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_alloca_test1 - ${SOURCES} -) - -add_dependencies(paltest_alloca_test1 coreclrpal) - -target_link_libraries(paltest_alloca_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp index b0552d457f8..d11b65e99dc 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__alloca_test1_paltest_alloca_test1, "c_runtime/_alloca/test1/paltest_alloca_test1") { char *testA = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/testinfo.dat deleted file mode 100644 index 30ef924f1e9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_alloca/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _alloca -Name = Positive Test for _alloca -TYPE = DEFAULT -EXE1 = test1 -Description -= Checks that _alloca allocates memory, and that the memory is -= readable and writeable. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt deleted file mode 100644 index c4df126e13e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fdopen_test1 - ${SOURCES} -) - -add_dependencies(paltest_fdopen_test1 coreclrpal) - -target_link_libraries(paltest_fdopen_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp index 608f537f25d..9cff3b731d8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp @@ -21,9 +21,9 @@ #include <palsuite.h> -const char* cTestString = "one fish, two fish, read fish, blue fish."; +#define cTestString "one fish, two fish, read fish, blue fish." -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__fdopen_test1_paltest_fdopen_test1, "c_runtime/_fdopen/test1/paltest_fdopen_test1") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/testinfo.dat deleted file mode 100644 index c2bbdb6b42a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_fdopen/test1/testinfo.dat +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fdopen -Name = test for fdopen and _close -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the fdopen function. -= This will test fdopen in r (read) mode. This test -= creates and opens a test pipe, to write and read -= from. fdopen requires a file handle(int), therefore -= _open_osfhandle is used to get that handle. -= _open_osfhandle is only used with CreatePipe. The -= test will write and read from the pipe comparing -= the results. -= As a secondary test, _close is tested since it needs -= the handle returned by _open_osfhandle. The handle is -= closed, then a read is attempted on the handle which -= should fail. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt deleted file mode 100644 index 55401112a47..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_finite_test1 - ${SOURCES} -) - -add_dependencies(paltest_finite_test1 coreclrpal) - -target_link_libraries(paltest_finite_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp index 4f86cad2f17..e21c9551b5c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp @@ -36,7 +36,7 @@ If E=0 and F is zero and S is 0, then V=0 #define TO_DOUBLE(x) (*((double*)((void*)&x))) -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__finite_test1_paltest_finite_test1, "c_runtime/_finite/test1/paltest_finite_test1") { /*non-finite numbers*/ UINT64 lsnan = UI64(0xffffffffffffffff); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/testinfo.dat deleted file mode 100644 index 3dd6f68f2f3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finite/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _finite -Name = Positive Test for _finite -TYPE = DEFAULT -EXE1 = test1 -Description -= Checks that _finite correctly classifies all types of floating point -= numbers (NaN, -Infinity, Infinity, finite nonzero, unnormalized, 0, and -0). diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt deleted file mode 100644 index 9e110ede88c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_finitef_test1 - ${SOURCES} -) - -add_dependencies(paltest_finitef_test1 coreclrpal) - -target_link_libraries(paltest_finitef_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/test1.cpp index 5f94ac464e7..5158fa9d840 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/test1.cpp @@ -36,7 +36,7 @@ If E=0 and F is zero and S is 0, then V=0 #define TO_FLOAT(x) (*((float*)((void*)&x))) -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__finitef_test1_paltest_finitef_test1, "c_runtime/_finitef/test1/paltest_finitef_test1") { /*non-finite numbers*/ UINT32 lsnan = 0xffffffffu; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/testinfo.dat deleted file mode 100644 index aeadb89d6f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_finitef/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _finitef -Name = Positive Test for _finitef -TYPE = DEFAULT -EXE1 = test1 -Description -= Checks that _finitef correctly classifies all types of floating point -= numbers (NaN, -Infinity, Infinity, finite nonzero, unnormalized, 0, and -0). diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt deleted file mode 100644 index 9440a99197b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - _gcvt.cpp -) - -add_executable(paltest_gcvt_test1 - ${SOURCES} -) - -add_dependencies(paltest_gcvt_test1 coreclrpal) - -target_link_libraries(paltest_gcvt_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp index e73d74b2cdf..ea2c1b02ade 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__gcvt_test1_paltest_gcvt_test1, "c_runtime/_gcvt/test1/paltest_gcvt_test1") { int err; double dValue = -3.1415926535; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/testinfo.dat deleted file mode 100644 index b32ac0e38f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _gcvt -Name = Positive test for _gcvt API to convert a floatable value to a string -TYPE = DEFAULT -EXE1 = _gcvt -Description -=Test the _gcvt to convert a floatable value to a string -=with specified sigficant digits stored diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt deleted file mode 100644 index 87f84e30f87..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_gcvt_test2 - ${SOURCES} -) - -add_dependencies(paltest_gcvt_test2 coreclrpal) - -target_link_libraries(paltest_gcvt_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp index 9ed63892f81..af41769786f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp @@ -24,7 +24,7 @@ struct testCase varies from windows sprintf */ }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__gcvt_test2_paltest_gcvt_test2, "c_runtime/_gcvt/test2/paltest_gcvt_test2") { char result[128]; int i=0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/testinfo.dat deleted file mode 100644 index 1dca549cc93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_gcvt/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _gcvt -Name = Call _gcvt on normal values, negatives, exponents and hex digits. -TYPE = DEFAULT -EXE1 = test2 -Description -= Call the _gcvt function on a number of cases. Check that it -= handles negatives, exponents and hex digits properly. Also check that -= the 'digit' specification works. (And that it doesn't truncate negative -= signs or decimals) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt deleted file mode 100644 index 31a173cfcbb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isnan_test1 - ${SOURCES} -) - -add_dependencies(paltest_isnan_test1 coreclrpal) - -target_link_libraries(paltest_isnan_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp index 6640bc4edcf..98a96cc2474 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp @@ -22,7 +22,7 @@ /* * NaN: any double with maximum exponent (0x7ff) and non-zero fraction */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__isnan_test1_paltest_isnan_test1, "c_runtime/_isnan/test1/paltest_isnan_test1") { /* * Initialize the PAL and return FAIL if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/testinfo.dat deleted file mode 100644 index 7762c56edb3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnan/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _isnan -Name = Test #1 for _isnan -TYPE = DEFAULT -EXE1 = test1 -Description -= Test _isnan with a number of trivial values, to ensure they indicated that -= they are numbers. Then try with Positive/Negative Infinite, which should -= also be numbers. Finally set the least and most significant bits of -= the fraction to positive and negative, at which point it should return -= the true value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt deleted file mode 100644 index 2189a703ed5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_isnanf_test1 - ${SOURCES} -) - -add_dependencies(paltest_isnanf_test1 coreclrpal) - -target_link_libraries(paltest_isnanf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/test1.cpp index 6fac5a718ca..b46b238342a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/test1.cpp @@ -22,7 +22,7 @@ /* * NaN: any float with maximum exponent (0x7f8) and non-zero fraction */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__isnanf_test1_paltest_isnanf_test1, "c_runtime/_isnanf/test1/paltest_isnanf_test1") { /* * Initialize the PAL and return FAIL if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/testinfo.dat deleted file mode 100644 index 362f6426576..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_isnanf/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _isnanf -Name = Test #1 for _isnanf -TYPE = DEFAULT -EXE1 = test1 -Description -= Test _isnanf with a number of trivial values, to ensure they indicated that -= they are numbers. Then try with Positive/Negative Infinite, which should -= also be numbers. Finally set the least and most significant bits of -= the fraction to positive and negative, at which point it should return -= the true value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt deleted file mode 100644 index 2c3d4ac509f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_itow_test1 - ${SOURCES} -) - -add_dependencies(paltest_itow_test1 coreclrpal) - -target_link_libraries(paltest_itow_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp index bd93868a0e4..15e6aa20179 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp @@ -23,7 +23,7 @@ struct testCase int radix; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__itow_test1_paltest_itow_test1, "c_runtime/_itow/test1/paltest_itow_test1") { char16_t result[20]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/testinfo.dat deleted file mode 100644 index 99b24cf89d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_itow/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _itow_s -Name = Positive Test for _itow_s -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _itow_s function. -= Test a number of ints with different radix on each, to ensure that the -= string returned is correct. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt deleted file mode 100644 index 2d7d3831512..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_putenv_test1 - ${SOURCES} -) - -add_dependencies(paltest_putenv_test1 coreclrpal) - -target_link_libraries(paltest_putenv_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp index 596c0e8dcfc..a7ebbe4fa61 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp @@ -21,19 +21,18 @@ struct TestElement BOOL bValidString; /* valid argument string identifier */ }; -struct TestElement TestCases[] = +PALTEST(c_runtime__putenv_test1_paltest_putenv_test1, "c_runtime/_putenv/test1/paltest_putenv_test1") { - {"PalTestingEnvironmentVariable=A value", "PalTestingEnvironmentVariable", - "A value", TRUE}, - {"AnotherVariable=", "AnotherVariable", "", TRUE}, - {"YetAnotherVariable", "", "", FALSE}, - {"=ADifferentVariable", "", "ADifferentVariable", FALSE}, - {"", "", "", FALSE} - -}; + struct TestElement TestCases[] = + { + {"PalTestingEnvironmentVariable=A value", "PalTestingEnvironmentVariable", + "A value", TRUE}, + {"AnotherVariable=", "AnotherVariable", "", TRUE}, + {"YetAnotherVariable", "", "", FALSE}, + {"=ADifferentVariable", "", "ADifferentVariable", FALSE}, + {"", "", "", FALSE} -int __cdecl main(int argc, char **argv) -{ + }; int i; char *variableValue; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/testinfo.dat deleted file mode 100644 index bf2e6c42ffa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _putenv -Name = Positive test for _putenv -TYPE = DEFAULT -EXE1 = test1 -Description -= Create an environment variable with _putenv and then use getenv to -= check it. Check that we get the expected errors with invalid input. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt deleted file mode 100644 index 41a75fa877b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_putenv_test2 - ${SOURCES} -) - -add_dependencies(paltest_putenv_test2 coreclrpal) - -target_link_libraries(paltest_putenv_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp index 170e55ff93b..ee84e375c2e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp @@ -18,7 +18,7 @@ const char *_putenvString1 = "AnUnusualVariable="; const char *variable = "AnUnusualVariable"; const char *value = "AnUnusualValue"; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__putenv_test2_paltest_putenv_test2, "c_runtime/_putenv/test2/paltest_putenv_test2") { char *variableValue; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/testinfo.dat deleted file mode 100644 index 7f033b4ca24..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _putenv -Name = Positive test for _putenv -TYPE = DEFAULT -EXE1 = test2 -Description -= Create an environment variable with _putenv and then use getenv to -= check it. This test resets an environment variable. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt deleted file mode 100644 index a3bab40990f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_putenv_test3 - ${SOURCES} -) - -add_dependencies(paltest_putenv_test3 coreclrpal) - -target_link_libraries(paltest_putenv_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp index c6889821d4d..74d057dadd4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__putenv_test3_paltest_putenv_test3, "c_runtime/_putenv/test3/paltest_putenv_test3") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/testinfo.dat deleted file mode 100644 index c1a8b91e1ee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _putenv -Name = Positive test for _putenv -TYPE = DEFAULT -EXE1 = test3 -Description -= Create environment variables that only differ by case -= and check that the BSD operating system treats them -= as two separate variables. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt deleted file mode 100644 index 78d1d705043..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_putenv_test4 - ${SOURCES} -) - -add_dependencies(paltest_putenv_test4 coreclrpal) - -target_link_libraries(paltest_putenv_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp index c7b9994a8e1..85fb19a171f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__putenv_test4_paltest_putenv_test4, "c_runtime/_putenv/test4/paltest_putenv_test4") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/testinfo.dat deleted file mode 100644 index 04ca0daad7e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_putenv/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _putenv -Name = Positive test for _putenv -TYPE = DEFAULT -EXE1 = test4 -Description -= Create an environment variable and check -= that trying to retrieve it using a name with different -= case, returns the correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt deleted file mode 100644 index bb0484752a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_rotl_test1 - ${SOURCES} -) - -add_dependencies(paltest_rotl_test1 coreclrpal) - -target_link_libraries(paltest_rotl_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp index 19e5cdb805d..52f321ec970 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp @@ -17,7 +17,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__rotl_test1_paltest_rotl_test1, "c_runtime/_rotl/test1/paltest_rotl_test1") { unsigned results = 0; int i,j; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/testinfo.dat deleted file mode 100644 index 4232c58bbdf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotl/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _rtol -Name = Positive Test for _rotl -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _rotl function. -= The _rotl function rotates the unsigned value. _rotl -= rotates the value left and "wraps" bits rotated off -= one end of value to the other end. -= This test compares the result to a previously determined -= value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt deleted file mode 100644 index c01bd982495..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_rotr_test1 - ${SOURCES} -) - -add_dependencies(paltest_rotr_test1 coreclrpal) - -target_link_libraries(paltest_rotr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp index e90ca0e853b..2f753c56b6c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp @@ -16,7 +16,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__rotr_test1_paltest_rotr_test1, "c_runtime/_rotr/test1/paltest_rotr_test1") { unsigned results = 0; int i,j; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/testinfo.dat deleted file mode 100644 index e56d80e9580..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_rotr/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _rtor -Name = Positive Test for _rotr -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _rotr function. -= The _rotr function rotates the unsigned value. _rotr -= rotates the value right and "wraps" bits rotated off -= one end of value to the other end. -= This test compares the result to a previously determined -= value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/_snprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/_snprintf_s.h index 35aeffe24e4..747d50a1e7f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/_snprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/_snprintf_s.h @@ -13,7 +13,7 @@ #ifndef __STRINGTEST_H__ #define __STRINGTEST_H__ -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_snprintf_s(const char *formatstr, char* param, const char *checkstr) { char buf[256] = { 0 }; @@ -25,8 +25,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) param, formatstr, checkstr, buf); } } +#define DoStrTest DoStrTest_snprintf_s -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_snprintf_s(const char *formatstr, WCHAR* param, const char *checkstr) { char buf[256] = { 0 }; @@ -38,9 +39,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) convertC(param), formatstr, checkstr, buf); } } +#define DoWStrTest DoWStrTest_snprintf_s - -void DoPointerTest(const char *formatstr, void* param, char* paramstr, char +inline void DoPointerTest_snprintf_s(const char *formatstr, void* param, char* paramstr, char *checkstr1) { char buf[256] = { 0 }; @@ -53,8 +54,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, char paramstr, formatstr, checkstr1, buf); } } +#define DoPointerTest DoPointerTest_snprintf_s -void DoCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoCountTest_snprintf_s(const char *formatstr, int param, const char *checkstr) { char buf[512] = { 0 }; int n = -1; @@ -71,8 +73,9 @@ void DoCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoCountTest DoCountTest_snprintf_s -void DoShortCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_snprintf_s(const char *formatstr, int param, const char *checkstr) { char buf[256] = { 0 }; short int n = -1; @@ -89,8 +92,9 @@ void DoShortCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoShortCountTest DoShortCountTest_snprintf_s -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_snprintf_s(const char *formatstr, char param, const char *checkstr) { char buf[256] = { 0 }; @@ -102,8 +106,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) param, param, formatstr, checkstr, buf); } } +#define DoCharTest DoCharTest_snprintf_s -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_snprintf_s(const char *formatstr, WCHAR param, const char *checkstr) { char buf[256] = { 0 }; @@ -115,8 +120,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) (char)param, param, formatstr, checkstr, buf); } } +#define DoWCharTest DoWCharTest_snprintf_s -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_snprintf_s(const char *formatstr, int value, const char *checkstr) { char buf[256] = { 0 }; @@ -128,8 +134,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) value, formatstr, checkstr, buf); } } +#define DoNumTest DoNumTest_snprintf_s -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) +inline void DoI64Test_snprintf_s(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) { char buf[256] = { 0 }; @@ -141,8 +148,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c valuestr, formatstr, checkstr1, buf); } } +#define DoI64Test DoI64Test_snprintf_s -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char +inline void DoDoubleTest_snprintf_s(const char *formatstr, double value, const char *checkstr1, char *checkstr2) { char buf[256] = { 0 }; @@ -156,8 +164,9 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, ch value, formatstr, checkstr1, checkstr2, buf); } } +#define DoDoubleTest DoDoubleTest_snprintf_s -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, char +inline void DoArgumentPrecTest_snprintf_s(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -172,8 +181,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, char } } +#define DoArgumentPrecTest DoArgumentPrecTest_snprintf_s -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_snprintf_s(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -188,6 +198,7 @@ const char *checkstr1, const char *checkstr2) } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_snprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt deleted file mode 100644 index 01802902dce..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_snprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test1 coreclrpal) - -target_link_libraries(paltest_snprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/test1.cpp index 39f91711b56..e7fc958b216 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/test1.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test1_paltest_snprintf_test1, "c_runtime/_snprintf_s/test1/paltest_snprintf_test1") { char checkstr[] = "hello world"; char buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/testinfo.dat deleted file mode 100644 index dd7e48e96b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if sprintf_s works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt deleted file mode 100644 index 2378bee2d0c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_snprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test10 coreclrpal) - -target_link_libraries(paltest_snprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/test10.cpp index e2f7d4aca34..1ed1831232e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/test10.cpp @@ -20,7 +20,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test10_paltest_snprintf_test10, "c_runtime/_snprintf_s/test10/paltest_snprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/testinfo.dat deleted file mode 100644 index 5bef07c257d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests sprintf_s with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt deleted file mode 100644 index 0eea7017a3a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_snprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test11 coreclrpal) - -target_link_libraries(paltest_snprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/test11.cpp index fc93a3c668d..2576460d7aa 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/test11.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test11_paltest_snprintf_test11, "c_runtime/_snprintf_s/test11/paltest_snprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/testinfo.dat deleted file mode 100644 index c65a26c7081..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests sprintf_s with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt deleted file mode 100644 index 5d824381ee8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_snprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test12 coreclrpal) - -target_link_libraries(paltest_snprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/test12.cpp index c1bee9c77f9..de62e6e2317 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/test12.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test12_paltest_snprintf_test12, "c_runtime/_snprintf_s/test12/paltest_snprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/testinfo.dat deleted file mode 100644 index 99db86d551d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests sprintf_s with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt deleted file mode 100644 index 74d1bc8454d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_snprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test13 coreclrpal) - -target_link_libraries(paltest_snprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/test13.cpp index 1e0f0e5383a..59c26ca4bbe 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/test13.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test13_paltest_snprintf_test13, "c_runtime/_snprintf_s/test13/paltest_snprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/testinfo.dat deleted file mode 100644 index 9ec9a9f53d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests sprintf_s with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt deleted file mode 100644 index b9592c99eea..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_snprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test14 coreclrpal) - -target_link_libraries(paltest_snprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/test14.cpp index 6bcf181a615..b3b5044a35e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/test14.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test14_paltest_snprintf_test14, "c_runtime/_snprintf_s/test14/paltest_snprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/testinfo.dat deleted file mode 100644 index d9d2d7dd4eb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests sprintf_s with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt deleted file mode 100644 index fe3736055c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_snprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test15 coreclrpal) - -target_link_libraries(paltest_snprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/test15.cpp index 818cb14c870..407af8cd797 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/test15.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test15_paltest_snprintf_test15, "c_runtime/_snprintf_s/test15/paltest_snprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/testinfo.dat deleted file mode 100644 index 458ef784771..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests sprintf_s with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt deleted file mode 100644 index 049abeba07c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_snprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test16 coreclrpal) - -target_link_libraries(paltest_snprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/test16.cpp index e47bb777dab..4ea8909c114 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/test16.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test16_paltest_snprintf_test16, "c_runtime/_snprintf_s/test16/paltest_snprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/testinfo.dat deleted file mode 100644 index a40e69e5310..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests sprintf_s with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt deleted file mode 100644 index 7bd8a420aec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_snprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test17 coreclrpal) - -target_link_libraries(paltest_snprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/test17.cpp index aef1be6a901..496744c0448 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/test17.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test17_paltest_snprintf_test17, "c_runtime/_snprintf_s/test17/paltest_snprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/testinfo.dat deleted file mode 100644 index 2782f03bb86..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests sprintf_s with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt deleted file mode 100644 index d61038daf85..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_snprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test18 coreclrpal) - -target_link_libraries(paltest_snprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/test18.cpp index 34c67f43c15..0a96a010407 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/test18.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test18_paltest_snprintf_test18, "c_runtime/_snprintf_s/test18/paltest_snprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/testinfo.dat deleted file mode 100644 index e93e01f2b11..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests sprintf_s with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt deleted file mode 100644 index 6d274d8a0de..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_snprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test19 coreclrpal) - -target_link_libraries(paltest_snprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/test19.cpp index 480b83fd276..f3335fa7000 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/test19.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test19_paltest_snprintf_test19, "c_runtime/_snprintf_s/test19/paltest_snprintf_test19") { int n = -1; if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/testinfo.dat deleted file mode 100644 index ea56b0bb8f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests sprintf_s with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt deleted file mode 100644 index 5ce56484bd8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_snprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test2 coreclrpal) - -target_link_libraries(paltest_snprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp index 1c8888ee388..4f8a95d2905 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp @@ -18,7 +18,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test2_paltest_snprintf_test2, "c_runtime/_snprintf_s/test2/paltest_snprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/testinfo.dat deleted file mode 100644 index 1ec448495ff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests sprintf_s with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt deleted file mode 100644 index ff4049e339b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_snprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test3 coreclrpal) - -target_link_libraries(paltest_snprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp index ed515e7bcd2..485ddfafc9e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test3_paltest_snprintf_test3, "c_runtime/_snprintf_s/test3/paltest_snprintf_test3") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/testinfo.dat deleted file mode 100644 index cc56fe26478..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests sprintf_s with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt deleted file mode 100644 index 2cbef279f12..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_snprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test4 coreclrpal) - -target_link_libraries(paltest_snprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp index 56b2a0c955b..3cc097d6af0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test4_paltest_snprintf_test4, "c_runtime/_snprintf_s/test4/paltest_snprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/testinfo.dat deleted file mode 100644 index 617c9b2d3e5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests sprintf_s with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt deleted file mode 100644 index 2fdc6641c26..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_snprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test6 coreclrpal) - -target_link_libraries(paltest_snprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/test6.cpp index b7ce3fac92e..69cd3a43fd4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/test6.cpp @@ -19,7 +19,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test6_paltest_snprintf_test6, "c_runtime/_snprintf_s/test6/paltest_snprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/testinfo.dat deleted file mode 100644 index 0c520ade03e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name =Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests sprintf_s with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt deleted file mode 100644 index 2e1636bf13b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_snprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test7 coreclrpal) - -target_link_libraries(paltest_snprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/test7.cpp index 0831dfa7496..76fb298bed9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/test7.cpp @@ -19,7 +19,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test7_paltest_snprintf_test7, "c_runtime/_snprintf_s/test7/paltest_snprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/testinfo.dat deleted file mode 100644 index 38fa9371fe5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests sprintf_s with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt deleted file mode 100644 index cf431206bde..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_snprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test8 coreclrpal) - -target_link_libraries(paltest_snprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/test8.cpp index d034f7572b1..d167949f0d3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/test8.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test8_paltest_snprintf_test8, "c_runtime/_snprintf_s/test8/paltest_snprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/testinfo.dat deleted file mode 100644 index 8c9e8cff321..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests sprintf_s with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt deleted file mode 100644 index 646c6de4bae..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_snprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_snprintf_test9 coreclrpal) - -target_link_libraries(paltest_snprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/test9.cpp index 1877ff9a807..82a1a10697c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/test9.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snprintf_s_test9_paltest_snprintf_test9, "c_runtime/_snprintf_s/test9/paltest_snprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/testinfo.dat deleted file mode 100644 index beb708ae943..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests sprintf_s with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/_snwprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/_snwprintf_s.h index 021dde0666f..45b5d2e2212 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/_snwprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/_snwprintf_s.h @@ -13,7 +13,7 @@ #ifndef ___SNWPRINTF_H__ #define ___SNWPRINTF_H__ -void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) +inline void DoWStrTest_snwprintf_s(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -26,8 +26,9 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoWStrTest DoWStrTest_snwprintf_s -void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) +inline void DoStrTest_snwprintf_s(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -40,8 +41,9 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) param, convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoStrTest DoStrTest_snwprintf_s -void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) +inline void DoPointerTest_snwprintf_s(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) { WCHAR buf[256] = { 0 }; @@ -53,8 +55,9 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) convertC(checkstr1), convertC(buf)); } } +#define DoPointerTest DoPointerTest_snwprintf_s -void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) +inline void DoCountTest_snwprintf_s(const WCHAR *formatstr, int param, const WCHAR *checkstr) { WCHAR buf[512] = { 0 }; int n = -1; @@ -73,8 +76,9 @@ void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoCountTest DoCountTest_snwprintf_s -void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) +inline void DoShortCountTest_snwprintf_s(const WCHAR *formatstr, int param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; short int n = -1; @@ -93,8 +97,9 @@ void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoShortCountTest DoShortCountTest_snwprintf_s -void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) +inline void DoCharTest_snwprintf_s(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -106,8 +111,9 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoCharTest DoCharTest_snwprintf_s -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoWCharTest_snwprintf_s(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -119,8 +125,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoWCharTest DoWCharTest_snwprintf_s -void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) +inline void DoNumTest_snwprintf_s(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -132,9 +139,9 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoNumTest DoNumTest_snwprintf_s - -void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc, +inline void DoI64Test_snwprintf_s(const WCHAR *formatstr, INT64 param, char *paramdesc, const WCHAR *checkstr1) { WCHAR buf[256] = { 0 }; @@ -147,8 +154,9 @@ void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc, convertC(formatstr), convertC(checkstr1), convertC(buf)); } } +#define DoI64Test DoI64Test_snwprintf_s -void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, +inline void DoDoubleTest_snwprintf_s(const WCHAR *formatstr, double value, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256] = { 0 }; @@ -163,8 +171,9 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, convertC(checkstr2), convertC(buf)); } } +#define DoDoubleTest DoDoubleTest_snwprintf_s -void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_snwprintf_s(const WCHAR *formatstr, int precision, void *param, char *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256]; @@ -179,8 +188,9 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, convertC(checkstr1), convertC(checkstr2) ,convertC(buf)); } } +#define DoArgumentPrecTest DoArgumentPrecTest_snwprintf_s -void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_snwprintf_s(const WCHAR *formatstr, int precision, double param, const WCHAR *checkstr) { WCHAR buf[256]; @@ -193,6 +203,7 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para precision, convertC(checkstr), convertC(buf)); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_snwprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt deleted file mode 100644 index 9650c18970a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_snwprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test1 coreclrpal) - -target_link_libraries(paltest_snwprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/test1.cpp index 27a6f7ccaf9..07bf99ca623 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/test1.cpp @@ -19,7 +19,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test1_paltest_snwprintf_test1, "c_runtime/_snwprintf_s/test1/paltest_snwprintf_test1") { WCHAR *checkstr; WCHAR buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/testinfo.dat deleted file mode 100644 index 5c5d41c9beb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if swprintf_s works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt deleted file mode 100644 index aa799bd5227..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_snwprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test10 coreclrpal) - -target_link_libraries(paltest_snwprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/test10.cpp index c5c9fcd2d11..a872426e23e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/test10.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test10_paltest_snwprintf_test10, "c_runtime/_snwprintf_s/test10/paltest_snwprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/testinfo.dat deleted file mode 100644 index c84916bba07..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests swprintf_s with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt deleted file mode 100644 index 7e2ef006b6f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_snwprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test11 coreclrpal) - -target_link_libraries(paltest_snwprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/test11.cpp index d82edff596f..c05140698c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/test11.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test11_paltest_snwprintf_test11, "c_runtime/_snwprintf_s/test11/paltest_snwprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/testinfo.dat deleted file mode 100644 index eb4cbfbda2b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests swprintf_s with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt deleted file mode 100644 index e43e3478185..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_snwprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test12 coreclrpal) - -target_link_libraries(paltest_snwprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/test12.cpp index 695275bf3e2..fd898e577e4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/test12.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test12_paltest_snwprintf_test12, "c_runtime/_snwprintf_s/test12/paltest_snwprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/testinfo.dat deleted file mode 100644 index b2d41d2d1d4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests swprintf_s with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt deleted file mode 100644 index a1bb54ce013..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_snwprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test13 coreclrpal) - -target_link_libraries(paltest_snwprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/test13.cpp index ce579b15487..2c28531146a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/test13.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test13_paltest_snwprintf_test13, "c_runtime/_snwprintf_s/test13/paltest_snwprintf_test13") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/testinfo.dat deleted file mode 100644 index 6e0760f01c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests swprintf_s with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt deleted file mode 100644 index c6811a57736..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_snwprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test14 coreclrpal) - -target_link_libraries(paltest_snwprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/test14.cpp index 87e44f45fcc..30475b8ff86 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/test14.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test14_paltest_snwprintf_test14, "c_runtime/_snwprintf_s/test14/paltest_snwprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/testinfo.dat deleted file mode 100644 index 1ac436cb395..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests swprintf_s with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt deleted file mode 100644 index 2f682050a9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_snwprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test15 coreclrpal) - -target_link_libraries(paltest_snwprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/test15.cpp index 58e94f6f73d..5f52e1bae04 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/test15.cpp @@ -19,7 +19,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test15_paltest_snwprintf_test15, "c_runtime/_snwprintf_s/test15/paltest_snwprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/testinfo.dat deleted file mode 100644 index 654c853070a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests swprintf_s with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt deleted file mode 100644 index f2c44ff154e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_snwprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test16 coreclrpal) - -target_link_libraries(paltest_snwprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/test16.cpp index 22ddff25770..cc4c4f5649b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/test16.cpp @@ -17,7 +17,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test16_paltest_snwprintf_test16, "c_runtime/_snwprintf_s/test16/paltest_snwprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/testinfo.dat deleted file mode 100644 index 8a0b2e720cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests swprintf_s with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt deleted file mode 100644 index 285b75044c7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_snwprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test17 coreclrpal) - -target_link_libraries(paltest_snwprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/test17.cpp index 8a4d4c2af4b..d86213f8bec 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/test17.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test17_paltest_snwprintf_test17, "c_runtime/_snwprintf_s/test17/paltest_snwprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/testinfo.dat deleted file mode 100644 index fa7eef03965..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests swprintf_s with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt deleted file mode 100644 index 4b51cbdeba0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_snwprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test18 coreclrpal) - -target_link_libraries(paltest_snwprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/test18.cpp index d07f8b351a7..93c17a4cf9e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/test18.cpp @@ -19,7 +19,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test18_paltest_snwprintf_test18, "c_runtime/_snwprintf_s/test18/paltest_snwprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/testinfo.dat deleted file mode 100644 index eaa0af13cd6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests swprintf_s with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt deleted file mode 100644 index 966fbb81a72..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_snwprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test19 coreclrpal) - -target_link_libraries(paltest_snwprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/test19.cpp index 62a55f7b8f4..eac6828a630 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/test19.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../_snwprintf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test19_paltest_snwprintf_test19, "c_runtime/_snwprintf_s/test19/paltest_snwprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/testinfo.dat deleted file mode 100644 index a18b094dc55..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests swprintf_s with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt deleted file mode 100644 index b4d38448460..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_snwprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test2 coreclrpal) - -target_link_libraries(paltest_snwprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp index b8c26901686..5d87d8abef8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp @@ -19,7 +19,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test2_paltest_snwprintf_test2, "c_runtime/_snwprintf_s/test2/paltest_snwprintf_test2") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/testinfo.dat deleted file mode 100644 index f63b59e2929..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests swprintf_s with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt deleted file mode 100644 index 115f0d8c70f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_snwprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test3 coreclrpal) - -target_link_libraries(paltest_snwprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp index 9439f4c92d2..4eaf305d209 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp @@ -19,7 +19,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test3_paltest_snwprintf_test3, "c_runtime/_snwprintf_s/test3/paltest_snwprintf_test3") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/testinfo.dat deleted file mode 100644 index 3d707741633..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests swprintf_s with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt deleted file mode 100644 index 27d9761fe67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_snwprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test4 coreclrpal) - -target_link_libraries(paltest_snwprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp index 18317f107b8..95224422d1e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp @@ -19,7 +19,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test4_paltest_snwprintf_test4, "c_runtime/_snwprintf_s/test4/paltest_snwprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/testinfo.dat deleted file mode 100644 index 4b175bd46b8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests swprintf_s with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt deleted file mode 100644 index 45d428f5a1e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_snwprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test6 coreclrpal) - -target_link_libraries(paltest_snwprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/test6.cpp index d30c670f074..1b2c375905a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/test6.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test6_paltest_snwprintf_test6, "c_runtime/_snwprintf_s/test6/paltest_snwprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/testinfo.dat deleted file mode 100644 index aeb753f2dbf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests swprintf_s with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt deleted file mode 100644 index 09a2acf00f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_snwprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test7 coreclrpal) - -target_link_libraries(paltest_snwprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/test7.cpp index f3516b44c35..cca130c1402 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/test7.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test7_paltest_snwprintf_test7, "c_runtime/_snwprintf_s/test7/paltest_snwprintf_test7") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/testinfo.dat deleted file mode 100644 index e145f4b113e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests swprintf_s with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt deleted file mode 100644 index ab283e6e422..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_snwprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test8 coreclrpal) - -target_link_libraries(paltest_snwprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/test8.cpp index 3495d2a8c27..c727f798224 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/test8.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test8_paltest_snwprintf_test8, "c_runtime/_snwprintf_s/test8/paltest_snwprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/testinfo.dat deleted file mode 100644 index ed8ba117437..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests swprintf_s with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt deleted file mode 100644 index d714bd9665d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_snwprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_snwprintf_test9 coreclrpal) - -target_link_libraries(paltest_snwprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/test9.cpp index 36f14c2a44c..b523b2886e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/test9.cpp @@ -18,7 +18,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__snwprintf_s_test9_paltest_snwprintf_test9, "c_runtime/_snwprintf_s/test9/paltest_snwprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/testinfo.dat deleted file mode 100644 index d5f7922809b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf_s -Name = Positive Test for swprintf_s -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests swprintf_s with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt deleted file mode 100644 index 03585f62299..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_stricmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_stricmp_test1 coreclrpal) - -target_link_libraries(paltest_stricmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp index af73788e3b5..c8b1c16b0d4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp @@ -19,7 +19,7 @@ * Note: The _stricmp is dependent on the LC_CTYPE category of the locale, * and this is ignored by these tests. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__stricmp_test1_paltest_stricmp_test1, "c_runtime/_stricmp/test1/paltest_stricmp_test1") { char *str1 = "foo"; char *str2 = "fOo"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/testinfo.dat deleted file mode 100644 index e3f3fdc903f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_stricmp/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _stricmp -Name = Positive Test for _stricmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Do a lower case compare. Check two strings, only different because they -= have different capitalization, and they should return 0. Try two strings -= which will return less than 0 (one is smaller than the other). Also try -= the opposite, to get a return value greater than 0. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt deleted file mode 100644 index 6d0e196ec44..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strnicmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_strnicmp_test1 coreclrpal) - -target_link_libraries(paltest_strnicmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp index a2d213359a4..4954abfb980 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__strnicmp_test1_paltest_strnicmp_test1, "c_runtime/_strnicmp/test1/paltest_strnicmp_test1") { char str1[] = "foo"; char str2[] = "foox"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/testinfo.dat deleted file mode 100644 index 716886c7e2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _strnicmp -Name = Test #1 for _strnicmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Take two strings and compare them, giving different lengths. -= Comparing str1 and str2 with str2 length, should return <0 -= Comparing str2 and str1 with str2 length, should return >0 -= Comparing str1 and str2 with str1 lenght, should return 0 -= Bring in str3, which has a capital, but this function is doing a lower -= case compare. Just ensure that two strings which differ only by capitals -= return 0. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h index 2d644f96345..ebb1b66bae4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h @@ -14,7 +14,7 @@ #define __STRINGTEST_H__ /* These functions leaks memory a lot. C'est la vie. */ -int Testvsnprintf(char* buf, size_t count, const char* format, ...) +inline int Testvsnprintf(char* buf, size_t count, const char* format, ...) { int retVal; va_list arglist; @@ -27,7 +27,7 @@ int Testvsnprintf(char* buf, size_t count, const char* format, ...) } -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_vsnprintf_s(const char *formatstr, char* param, const char *checkstr) { char buf[256] = { 0 }; @@ -39,8 +39,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) param, formatstr, checkstr, buf); } } +#define DoStrTest DoStrTest_vsnprintf_s -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_vsnprintf_s(const char *formatstr, WCHAR* param, const char *checkstr) { char buf[256] = { 0 }; @@ -52,9 +53,10 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) convertC(param), formatstr, checkstr, buf); } } +#define DoWStrTest DoWStrTest_vsnprintf_s -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_vsnprintf_s(const char *formatstr, char param, const char *checkstr) { char buf[256] = { 0 }; @@ -66,8 +68,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) param, param, formatstr, checkstr, buf); } } +#define DoCharTest DoCharTest_vsnprintf_s -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_vsnprintf_s(const char *formatstr, WCHAR param, const char *checkstr) { char buf[256] = { 0 }; @@ -79,8 +82,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) (char)param, param, formatstr, checkstr, buf); } } +#define DoWCharTest DoWCharTest_vsnprintf_s -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_vsnprintf_s(const char *formatstr, int value, const char *checkstr) { char buf[256] = { 0 }; @@ -92,8 +96,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) value, formatstr, checkstr, buf); } } +#define DoNumTest DoNumTest_vsnprintf_s -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) +inline void DoI64Test_vsnprintf_s(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) { char buf[256] = { 0 }; @@ -105,7 +110,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c valuestr, formatstr, checkstr, buf); } } -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char +#define DoI64Test DoI64Test_vsnprintf_s + +inline void DoDoubleTest_vsnprintf_s(const char *formatstr, double value, const char *checkstr1, char *checkstr2) { char buf[256] = { 0 }; @@ -119,5 +126,6 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, ch value, formatstr, checkstr1, checkstr2, buf); } } +#define DoDoubleTest DoDoubleTest_vsnprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt deleted file mode 100644 index ebd4ae1f357..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vsnprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test1 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp index 37119ac11e2..a94a7aa8e08 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test1_paltest_vsnprintf_test1, "c_runtime/_vsnprintf_s/test1/paltest_vsnprintf_test1") { char checkstr[] = "hello world"; char buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat deleted file mode 100644 index 8afb6aa8bd0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _vsnprintf function. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt deleted file mode 100644 index 58ac92e5f66..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vsnprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test10 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp index dd0eb89b033..2fcf1976503 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test10_paltest_vsnprintf_test10, "c_runtime/_vsnprintf_s/test10/paltest_vsnprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat deleted file mode 100644 index af151c49530..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with octal numbers. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt deleted file mode 100644 index e278c6e5513..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vsnprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test11 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp index ffb8fb02923..3f3ae038645 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test11_paltest_vsnprintf_test11, "c_runtime/_vsnprintf_s/test11/paltest_vsnprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat deleted file mode 100644 index d1c5c14be03..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with unsigned numbers. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt deleted file mode 100644 index 5541c2b6872..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vsnprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test12 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp index b0af9dc0168..621963f2c7f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test12_paltest_vsnprintf_test12, "c_runtime/_vsnprintf_s/test12/paltest_vsnprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat deleted file mode 100644 index 0fd1c9c1d01..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with hex numbers (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt deleted file mode 100644 index 1a17849365e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vsnprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test13 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp index c029b277cfe..f053c514a60 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test13_paltest_vsnprintf_test13, "c_runtime/_vsnprintf_s/test13/paltest_vsnprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat deleted file mode 100644 index 1e72c511785..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with hex numbers (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt deleted file mode 100644 index 831b5f5c178..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vsnprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test14 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp index 74994e0ede3..0e08acd6e4e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test14_paltest_vsnprintf_test14, "c_runtime/_vsnprintf_s/test14/paltest_vsnprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat deleted file mode 100644 index abcbead26d2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with exponential format doubles (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt deleted file mode 100644 index 437a16abc36..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vsnprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test15 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp index e1010894d86..7850806b292 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test15_paltest_vsnprintf_test15, "c_runtime/_vsnprintf_s/test15/paltest_vsnprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat deleted file mode 100644 index 6e2e53c902d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with exponential format doubles (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt deleted file mode 100644 index 991e9f1553e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vsnprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test16 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp index 8d71d155e50..5892a0c01d8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test16_paltest_vsnprintf_test16, "c_runtime/_vsnprintf_s/test16/paltest_vsnprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat deleted file mode 100644 index 5738e44f8f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with decimal point format doubles. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt deleted file mode 100644 index 381620edae1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vsnprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test17 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp index 658fb109add..0522158f736 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test17_paltest_vsnprintf_test17, "c_runtime/_vsnprintf_s/test17/paltest_vsnprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat deleted file mode 100644 index 34d783aaf93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with compact format doubles (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt deleted file mode 100644 index ebaa8963c38..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vsnprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test18 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp index 0fc57a75f15..27566712c09 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test18_paltest_vsnprintf_test18, "c_runtime/_vsnprintf_s/test18/paltest_vsnprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat deleted file mode 100644 index cd04495f958..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with compact format doubles (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt deleted file mode 100644 index cd9a2ba7d1b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vsnprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test19 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp index 9b2227ea059..731dfe0bb5d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp @@ -53,7 +53,7 @@ void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test19_paltest_vsnprintf_test19, "c_runtime/_vsnprintf_s/test19/paltest_vsnprintf_test19") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat deleted file mode 100644 index 73c4a9d0e3e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with argument specified precision. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt deleted file mode 100644 index c44669c8714..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vsnprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test2 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp index f23d4c9f932..b9fe80c7635 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp @@ -16,7 +16,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test2_paltest_vsnprintf_test2, "c_runtime/_vsnprintf_s/test2/paltest_vsnprintf_test2") { WCHAR szwStr[] = {'b','a','r','\0'}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat deleted file mode 100644 index 6e79fd7692d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with strings. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt deleted file mode 100644 index 29f08e6c5e1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vsnprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test3 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp index ec00c09d9c0..decb64aa3c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test3_paltest_vsnprintf_test3, "c_runtime/_vsnprintf_s/test3/paltest_vsnprintf_test3") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat deleted file mode 100644 index 7acd05dcfdf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with wide strings. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt deleted file mode 100644 index f81e2618e4e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vsnprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test4 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp index 1478dbaab79..37c4a63f0b6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp @@ -45,7 +45,7 @@ static void DoI64DoubleTest(char *formatstr, INT64 value, char *valuestr, char } } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test4_paltest_vsnprintf_test4, "c_runtime/_vsnprintf_s/test4/paltest_vsnprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat deleted file mode 100644 index 8e63da1a8d2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with pointers. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt deleted file mode 100644 index cdd8b82d0f5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vsnprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test6 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp index 1482bc722d5..88a1fa1bee9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test6_paltest_vsnprintf_test6, "c_runtime/_vsnprintf_s/test6/paltest_vsnprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat deleted file mode 100644 index 9611f432d3e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with characters. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt deleted file mode 100644 index d28f9382306..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vsnprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test7 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp index f56aa497e92..87ac8d4994f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test7_paltest_vsnprintf_test7, "c_runtime/_vsnprintf_s/test7/paltest_vsnprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat deleted file mode 100644 index 2eea64b74ac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with wide characters. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt deleted file mode 100644 index 39ea287c434..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vsnprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test8 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp index 073be3fc029..beb5420d8d4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test8_paltest_vsnprintf_test8, "c_runtime/_vsnprintf_s/test8/paltest_vsnprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat deleted file mode 100644 index 691c02d3b12..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with decimal numbers. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt deleted file mode 100644 index 9eb5316ae8e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vsnprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test9 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp index f8afbe0409a..b84c24e509b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnprintf_s_test9_paltest_vsnprintf_test9, "c_runtime/_vsnprintf_s/test9/paltest_vsnprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat deleted file mode 100644 index 03141bca19d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with integer numbers. -= This test is modeled after sprintf_s. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h index 657fbd948ef..6b230412a27 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h @@ -14,7 +14,7 @@ #define ___VSNWPRINTF_H__ /* These functions leaks memory a lot. C'est la vie. */ -int TestVsnwprintf_s(char16_t* buf, size_t count, const char16_t* format, ...) +inline int TestVsnwprintf_s(char16_t* buf, size_t count, const char16_t* format, ...) { int retVal = 0; va_list arglist; @@ -26,8 +26,7 @@ int TestVsnwprintf_s(char16_t* buf, size_t count, const char16_t* format, ...) return( retVal); } - -void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) +inline void DoWStrTest_vsnwprintf_s(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -41,8 +40,9 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoWStrTest DoWStrTest_vsnwprintf_s -void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) +inline void DoStrTest_vsnwprintf_s(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -56,8 +56,9 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) convertC(buf)); } } +#define DoStrTest DoStrTest_vsnwprintf_s -void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) +inline void DoCharTest_vsnwprintf_s(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -70,8 +71,9 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) convertC(buf)); } } +#define DoCharTest DoCharTest_vsnwprintf_s -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoWCharTest_vsnwprintf_s(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -84,8 +86,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoWCharTest DoWCharTest_vsnwprintf_s -void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) +inline void DoNumTest_vsnwprintf_s(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -97,8 +100,9 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoNumTest DoNumTest_vsnwprintf_s -void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr) +inline void DoI64NumTest_vsnwprintf_s(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -110,7 +114,9 @@ void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCH convertC(checkstr), convertC(buf)); } } -void DoDoubleTest(const WCHAR *formatstr, double value, +#define DoI64NumTest DoI64NumTest_vsnwprintf_s + +inline void DoDoubleTest_vsnwprintf_s(const WCHAR *formatstr, double value, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256] = { 0 }; @@ -128,5 +134,6 @@ void DoDoubleTest(const WCHAR *formatstr, double value, convertC(buf)); } } +#define DoDoubleTest DoDoubleTest_vsnwprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt deleted file mode 100644 index de610ede2f5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vsnwprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test1 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/test1.cpp index 1a70f3c95bc..970a099d80c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/test1.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test1_paltest_vsnwprintf_test1, "c_runtime/_vsnwprintf_s/test1/paltest_vsnwprintf_test1") { WCHAR *checkstr; WCHAR buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/testinfo.dat deleted file mode 100644 index a96b906db64..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= General test to see if _vsnwprintf_s works correctly. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt deleted file mode 100644 index d67ddba7249..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vsnwprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test10 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/test10.cpp index 38df25d6aaf..e4edbb8c527 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/test10.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test10_paltest_vsnwprintf_test10, "c_runtime/_vsnwprintf_s/test10/paltest_vsnwprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/testinfo.dat deleted file mode 100644 index 100bc35dcc2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with octal numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt deleted file mode 100644 index f237ff3ed94..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vsnwprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test11 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/test11.cpp index c3d0c5e2efc..fd3f5bf9f99 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/test11.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test11_paltest_vsnwprintf_test11, "c_runtime/_vsnwprintf_s/test11/paltest_vsnwprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/testinfo.dat deleted file mode 100644 index 15c72800602..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with unsigned numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt deleted file mode 100644 index 6f2b3dad165..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vsnwprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test12 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/test12.cpp index b2f989f405b..d2e6d547ea6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/test12.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test12_paltest_vsnwprintf_test12, "c_runtime/_vsnwprintf_s/test12/paltest_vsnwprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/testinfo.dat deleted file mode 100644 index 58170273368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with hex numbers (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt deleted file mode 100644 index b5e07b3962a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vsnwprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test13 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/test13.cpp index a505316da63..64f89cd5714 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/test13.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test13_paltest_vsnwprintf_test13, "c_runtime/_vsnwprintf_s/test13/paltest_vsnwprintf_test13") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/testinfo.dat deleted file mode 100644 index 3c689872d09..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with hex numbers (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt deleted file mode 100644 index 77592622ffa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vsnwprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test14 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/test14.cpp index e5b14b24d00..8fca1904231 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/test14.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test14_paltest_vsnwprintf_test14, "c_runtime/_vsnwprintf_s/test14/paltest_vsnwprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/testinfo.dat deleted file mode 100644 index bc7c6aecee7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with exponential format doubles (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt deleted file mode 100644 index bceb26c2cdf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vsnwprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test15 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/test15.cpp index a61648d43d3..9fe695ae86c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/test15.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test15_paltest_vsnwprintf_test15, "c_runtime/_vsnwprintf_s/test15/paltest_vsnwprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/testinfo.dat deleted file mode 100644 index b5f6a0e4010..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with exponential format doubles (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt deleted file mode 100644 index fb0c75e66bb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vsnwprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test16 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/test16.cpp index 4cc272b478a..ac20afefb22 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/test16.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test16_paltest_vsnwprintf_test16, "c_runtime/_vsnwprintf_s/test16/paltest_vsnwprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/testinfo.dat deleted file mode 100644 index 17bbd3f6962..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with decimal point format doubles. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt deleted file mode 100644 index 41e35b4b866..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vsnwprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test17 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/test17.cpp index 41edb8f0518..d4317b17c17 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/test17.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test17_paltest_vsnwprintf_test17, "c_runtime/_vsnwprintf_s/test17/paltest_vsnwprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/testinfo.dat deleted file mode 100644 index e8ca626f793..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with compact format doubles (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt deleted file mode 100644 index 0c99b557638..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vsnwprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test18 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/test18.cpp index fdac25414a5..7ae932f57d7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/test18.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test18_paltest_vsnwprintf_test18, "c_runtime/_vsnwprintf_s/test18/paltest_vsnwprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/testinfo.dat deleted file mode 100644 index be103493043..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with compact format doubles (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt deleted file mode 100644 index f4b0562b3fa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vsnwprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test19 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/test19.cpp index dcb6d758e31..158ff1a644e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/test19.cpp @@ -18,7 +18,7 @@ #define DOTEST(a,b,c,d,e) DoTest(a,b,(void*)c,d,e) -void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, +void DoArgumentPrecTest_vsnwprintf_s(WCHAR *formatstr, int precision, void *param, WCHAR *paramstr, WCHAR *checkstr1, WCHAR *checkstr2) { WCHAR buf[256]; @@ -37,7 +37,7 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, convertC(buf)); } } -void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, +void DoArgumentPrecDoubleTest_vsnwprintf_s(WCHAR *formatstr, int precision, double param, WCHAR *checkstr1, WCHAR *checkstr2) { WCHAR buf[256]; @@ -60,7 +60,7 @@ void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test19_paltest_vsnwprintf_test19, "c_runtime/_vsnwprintf_s/test19/paltest_vsnwprintf_test19") { if (PAL_Initialize(argc, argv) != 0) @@ -68,69 +68,69 @@ int __cdecl main(int argc, char *argv[]) return(FAIL); } - DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"), convert("ba"), convert("ba")); - DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', convert("a"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*c"), 0, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*c"), 4, (void*)'a', convert("a"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*c"), 4, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*C"), 0, (void*)'a', convert("a"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*C"), 0, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*C"), 4, (void*)'a', convert("a"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*C"), 4, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*d"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*d"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*d"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*d"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*i"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*i"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*i"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*i"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*o"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*o"), 1, (void*)42, convert("42"), convert("52"), convert("52")); - DoArgumentPrecTest(convert("%.*o"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*o"), 3, (void*)42, convert("42"), convert("052"), convert("052")); - DoArgumentPrecTest(convert("%.*u"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*u"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*u"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*u"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*x"), 1, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*x"), 1, (void*)0x42, convert("0x42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*x"), 3, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*x"), 3, (void*)0x42, convert("0x42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*X"), 1, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*X"), 1, (void*)0x42, convert("0x42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*X"), 3, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vsnwprintf_s(convert("%.*X"), 3, (void*)0x42, convert("0x42"), convert("042"), convert("042")); - DoArgumentPrecDoubleTest(convert("%.*e"), 1, 2.01, convert("2.0e+000"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*e"), 1, 2.01, convert("2.0e+000"), convert("2.0e+00")); - DoArgumentPrecDoubleTest(convert("%.*e"), 3, 2.01, convert("2.010e+000"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*e"), 3, 2.01, convert("2.010e+000"), convert("2.010e+00")); - DoArgumentPrecDoubleTest(convert("%.*E"), 1, 2.01, convert("2.0E+000"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*E"), 1, 2.01, convert("2.0E+000"), convert("2.0E+00")); - DoArgumentPrecDoubleTest(convert("%.*E"), 3, 2.01, convert("2.010E+000"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*E"), 3, 2.01, convert("2.010E+000"), convert("2.010E+00")); - DoArgumentPrecDoubleTest(convert("%.*f"), 1, 2.01, convert("2.0"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*f"), 1, 2.01, convert("2.0"), convert("2.0")); - DoArgumentPrecDoubleTest(convert("%.*f"), 3, 2.01, convert("2.010"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*f"), 3, 2.01, convert("2.010"), convert("2.010")); - DoArgumentPrecDoubleTest(convert("%.*g"), 1, 256.01, convert("3e+002"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*g"), 1, 256.01, convert("3e+002"), convert("3e+02")); - DoArgumentPrecDoubleTest(convert("%.*g"), 3, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*g"), 3, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*g"), 4, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*g"), 4, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*g"), 6, 256.01, convert("256.01"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*g"), 6, 256.01, convert("256.01"), convert("256.01")); - DoArgumentPrecDoubleTest(convert("%.*G"), 1, 256.01, convert("3E+002"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*G"), 1, 256.01, convert("3E+002"), convert("3E+02")); - DoArgumentPrecDoubleTest(convert("%.*G"), 3, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*G"), 3, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*G"), 4, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*G"), 4, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*G"), 6, 256.01, convert("256.01"), + DoArgumentPrecDoubleTest_vsnwprintf_s(convert("%.*G"), 6, 256.01, convert("256.01"), convert("256.01")); PAL_Terminate(); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/testinfo.dat deleted file mode 100644 index ef3e466d6c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with argument specified precision. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt deleted file mode 100644 index d2838142c3c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vsnwprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test2 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp index 6f0026ec34a..ce5a74cc080 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test2_paltest_vsnwprintf_test2, "c_runtime/_vsnwprintf_s/test2/paltest_vsnwprintf_test2") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/testinfo.dat deleted file mode 100644 index 9d30e1c586d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with strings. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt deleted file mode 100644 index 8c2c5c954fc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vsnwprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test3 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp index e238a35194d..30aa2d87c5e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test3_paltest_vsnwprintf_test3, "c_runtime/_vsnwprintf_s/test3/paltest_vsnwprintf_test3") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/testinfo.dat deleted file mode 100644 index 22e9b85ee0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with wide strings. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt deleted file mode 100644 index eafb0796099..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vsnwprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test4 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp index fa553982b93..1caa4829db0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp @@ -50,7 +50,7 @@ static void DoI64DoubleTest(WCHAR *formatstr, INT64 value, WCHAR *valuestr, } } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test4_paltest_vsnwprintf_test4, "c_runtime/_vsnwprintf_s/test4/paltest_vsnwprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/testinfo.dat deleted file mode 100644 index 991a73ce90a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with pointers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt deleted file mode 100644 index 98faea5200e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vsnwprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test6 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/test6.cpp index 79335d0b2d2..cc0faddf718 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/test6.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test6_paltest_vsnwprintf_test6, "c_runtime/_vsnwprintf_s/test6/paltest_vsnwprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/testinfo.dat deleted file mode 100644 index c93821024e6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with characters. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt deleted file mode 100644 index d36a9ff26aa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vsnwprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test7 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/test7.cpp index 898f3f0f411..d31e77bb322 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/test7.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test7_paltest_vsnwprintf_test7, "c_runtime/_vsnwprintf_s/test7/paltest_vsnwprintf_test7") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/testinfo.dat deleted file mode 100644 index 3b36ecec6a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with wide characters. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt deleted file mode 100644 index 0c0440d3542..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vsnwprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test8 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/test8.cpp index 9bf5f6c37c9..e26b49ab8d6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/test8.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test8_paltest_vsnwprintf_test8, "c_runtime/_vsnwprintf_s/test8/paltest_vsnwprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/testinfo.dat deleted file mode 100644 index c09cdac6277..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with decimal numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt deleted file mode 100644 index e8117b5bde5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vsnwprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vsnwprintf_test9 coreclrpal) - -target_link_libraries(paltest_vsnwprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/test9.cpp index f3cfb5dbb79..12e8c46aa55 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/test9.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__vsnwprintf_s_test9_paltest_vsnwprintf_test9, "c_runtime/_vsnwprintf_s/test9/paltest_vsnwprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/testinfo.dat deleted file mode 100644 index a166a92cc7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _vsnwprintf_s -Name = Positive Test for _vsnwprintf_s -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the _vsnwprintf_s function. -= Tests _vsnwprintf_s with integer numbers -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt deleted file mode 100644 index b3f31074d59..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsicmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsicmp_test1 coreclrpal) - -target_link_libraries(paltest_wcsicmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp index 3b063b469fd..54f38f32d48 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp @@ -17,7 +17,7 @@ * Note: The _wcsicmp is dependent on the LC_CTYPE category of the locale, * and this is ignored by these tests. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__wcsicmp_test1_paltest_wcsicmp_test1, "c_runtime/_wcsicmp/test1/paltest_wcsicmp_test1") { WCHAR str1[] = {'f','o','o',0}; WCHAR str2[] = {'f','O','o',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/testinfo.dat deleted file mode 100644 index 0fbf1a06c17..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wcsicmp -Name = Test #1 for _wcsicmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that _wcsicmp correctly compares two strings with case insensitivity. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt deleted file mode 100644 index c2ed3092367..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcslwr_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcslwr_test1 coreclrpal) - -target_link_libraries(paltest_wcslwr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp index 9426c1eb433..f3088eec0cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp @@ -16,7 +16,7 @@ /* uses memcmp,wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__wcslwr_test1_paltest_wcslwr_test1, "c_runtime/_wcslwr/test1/paltest_wcslwr_test1") { WCHAR *test_str = NULL; WCHAR *expect_str = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/testinfo.dat deleted file mode 100644 index 3579b4d4a05..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wcslwr -Name = Positive Test for _wcslwr -TYPE = DEFAULT -EXE1 = test1 -Description -= Using memcmp to check the result, convert a wide character string -= with capitals, to all lowercase using this function. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt deleted file mode 100644 index 692e0d332c7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsnicmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsnicmp_test1 coreclrpal) - -target_link_libraries(paltest_wcsnicmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp index 05ef6c24df0..05252661327 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp @@ -22,7 +22,7 @@ * Notes: uses wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime__wcsnicmp_test1_paltest_wcsnicmp_test1, "c_runtime/_wcsnicmp/test1/paltest_wcsnicmp_test1") { WCHAR str1[] = {'f','o','o',0}; WCHAR str2[] = {'f','o','o','x',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/testinfo.dat deleted file mode 100644 index 9f3f97a570f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wcsnicmp -Name = Positive Test for _wcsnicmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Take two wide strings and compare them, giving different lengths. -= Comparing str1 and str2 with str2 length, should return <0 -= Comparing str2 and str1 with str2 length, should return >0 -= Comparing str1 and str2 with str1 lenght, should return 0 -= Bring in str3, which has a capital, but this function is doing a lower -= case compare. Just ensure that two strings which differ only by capitals -= return 0. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/CMakeLists.txt deleted file mode 100644 index 7cd88f8e86d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt deleted file mode 100644 index 505ed8461c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wfopen_test1 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test1 coreclrpal) - -target_link_libraries(paltest_wfopen_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp index a13f222fccd..7b96770bc54 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp @@ -25,7 +25,7 @@ struct testCase WCHAR mode[20]; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test1_paltest_wfopen_test1, "c_runtime/_wfopen/test1/paltest_wfopen_test1") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/testinfo.dat deleted file mode 100644 index 2ca737be79b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test1 -Description -= This test simply attempts to open a number of files with different -= modes. It checks to ensure a valid file pointer is returned. It -= doesn't do any checking to ensure the mode is really what it claims. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt deleted file mode 100644 index 427988b2b6b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_wfopen_test2 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test2 coreclrpal) - -target_link_libraries(paltest_wfopen_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp index 6f46cd74e84..ccc1a105502 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp @@ -21,7 +21,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test2_paltest_wfopen_test2, "c_runtime/_wfopen/test2/paltest_wfopen_test2") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/testinfo.dat deleted file mode 100644 index ab79c00e6d8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure that you can write to a 'w' mode file. And that you can't -= read from a 'w' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt deleted file mode 100644 index fb3c532ca4e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_wfopen_test3 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test3 coreclrpal) - -target_link_libraries(paltest_wfopen_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp index bda512add38..081f9d9bb96 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test3_paltest_wfopen_test3, "c_runtime/_wfopen/test3/paltest_wfopen_test3") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/testinfo.dat deleted file mode 100644 index cc8ca913759..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test3 -Description -= Test to ensure that you can write to a 'w+' mode file. And that you can -= read from a 'w+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt deleted file mode 100644 index 3f7839c2cd1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_wfopen_test4 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test4 coreclrpal) - -target_link_libraries(paltest_wfopen_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp index e865cbcb978..93f137f0a9a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test4_paltest_wfopen_test4, "c_runtime/_wfopen/test4/paltest_wfopen_test4") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/testinfo.dat deleted file mode 100644 index 9413f99556d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure that you can't write to a 'r' mode file. And that you can -= read from a 'r' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt deleted file mode 100644 index 00e4a074c84..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_wfopen_test5 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test5 coreclrpal) - -target_link_libraries(paltest_wfopen_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp index 58abf0a5eaf..10839d1c6c9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test5_paltest_wfopen_test5, "c_runtime/_wfopen/test5/paltest_wfopen_test5") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/testinfo.dat deleted file mode 100644 index dc357498445..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test5 -Description -= Test to ensure that you can write to a 'r+' mode file. And that you can -= read from a 'r+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt deleted file mode 100644 index 1eb7eca3c85..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_wfopen_test6 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test6 coreclrpal) - -target_link_libraries(paltest_wfopen_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp index c64c4a0a9c2..269ca1f5cc1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test6_paltest_wfopen_test6, "c_runtime/_wfopen/test6/paltest_wfopen_test6") { FILE *fp; char buffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/testinfo.dat deleted file mode 100644 index 4201a2e168d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test6 -Description -= Test to ensure that you can write to a 'a' mode file. And that you can't -= read from a 'a' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt deleted file mode 100644 index 9afa9976119..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_wfopen_test7 - ${SOURCES} -) - -add_dependencies(paltest_wfopen_test7 coreclrpal) - -target_link_libraries(paltest_wfopen_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp index 7f13df41523..419707a13ac 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wfopen_test7_paltest_wfopen_test7, "c_runtime/_wfopen/test7/paltest_wfopen_test7") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/testinfo.dat deleted file mode 100644 index 33d6252de83..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wfopen/test7/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wfopen -Name = Positive Test for _wfopen -TYPE = DEFAULT -EXE1 = test7 -Description -= Test to ensure that you can write to a 'a+' mode file. And that you can -= read from a 'a+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt deleted file mode 100644 index a7243e7d51b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wtoi_test1 - ${SOURCES} -) - -add_dependencies(paltest_wtoi_test1 coreclrpal) - -target_link_libraries(paltest_wtoi_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp index 0829af70606..3d0ff1f5ed2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp @@ -24,7 +24,7 @@ struct testCase char avalue[20]; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime__wtoi_test1_paltest_wtoi_test1, "c_runtime/_wtoi/test1/paltest_wtoi_test1") { int result=0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/testinfo.dat deleted file mode 100644 index 5d2801d5d1f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_wtoi/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = _wtoi -Name = Test _wtoi on valid and invalid ints in a variety of formats -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _wtoi function. -= Check to ensure that the different ints are handled properly. -= Exponents and decimals should be treated as invalid characters, -= causing the conversion to quit. Whitespace before the int is valid. -= Check would-be octal/hex digits to ensure they're treated no -= differently than other strings. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt deleted file mode 100644 index 89bccbbe69b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - abs.cpp -) - -add_executable(paltest_abs_test1 - ${SOURCES} -) - -add_dependencies(paltest_abs_test1 coreclrpal) - -target_link_libraries(paltest_abs_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp index b567c37a93d..9ad83d64e3a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp @@ -18,7 +18,7 @@ struct TESTS int nResult; }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_abs_test1_paltest_abs_test1, "c_runtime/abs/test1/paltest_abs_test1") { int i = 0; int nRc = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/testinfo.dat deleted file mode 100644 index 1719a0c5505..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/abs/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C runtime -Function = abs -Name = test for abs (test 1) -Type = DEFAULT -EXE1 = abs -Description -= Test abs by passing a list of values and ensuring the -= proper absolute value is returned. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt deleted file mode 100644 index e654dc3ab29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_acos_test1 - ${SOURCES} -) - -add_dependencies(paltest_acos_test1 coreclrpal) - -target_link_libraries(paltest_acos_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp index 4c6cceb4d1c..5de46458e50 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * acos_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl acos_test1_validate(double value, double expected, double variance) { double result = acos(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * acos_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl acos_test1_validate_isnan(double value) { double result = acos(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_acos_test1_paltest_acos_test1, "c_runtime/acos/test1/paltest_acos_test1") { struct test tests[] = { @@ -117,12 +117,12 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + acos_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + acos_test1_validate_isnan(PAL_NEGINF); + acos_test1_validate_isnan(PAL_NAN); + acos_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/testinfo.dat deleted file mode 100644 index 877437d8f39..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acos/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = acos -Name = Positive Test for acos -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the acos() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt deleted file mode 100644 index 2952068d816..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_acosf_test1 - ${SOURCES} -) - -add_dependencies(paltest_acosf_test1 coreclrpal) - -target_link_libraries(paltest_acosf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/test1.cpp index 8d612ab40d1..909d43cab78 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * acosf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl acosf_test1_validate(float value, float expected, float variance) { float result = acosf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * acosf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl acosf_test1_validate_isnan(float value) { float result = acosf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_acosf_test1_paltest_acosf_test1, "c_runtime/acosf/test1/paltest_acosf_test1") { struct test tests[] = { @@ -116,12 +116,12 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + acosf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + acosf_test1_validate_isnan(PAL_NEGINF); + acosf_test1_validate_isnan(PAL_NAN); + acosf_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/testinfo.dat deleted file mode 100644 index de8fedaed3c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = acosf -Name = Positive Test for acosf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the acosf() function, -= checking each for the expfected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/CMakeLists.txt deleted file mode 100644 index dfd040565bf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_acosh_test1 - ${SOURCES} -) - -add_dependencies(paltest_acosh_test1 coreclrpal) - -target_link_libraries(paltest_acosh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/test1.cpp index 4ffa84211fd..3d9368fcd94 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * acosh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl acosh_test1_validate(double value, double expected, double variance) { double result = acosh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * acosh_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl acosh_test1_validate_isnan(double value) { double result = acosh(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_acosh_test1_paltest_acosh_test1, "c_runtime/acosh/test1/paltest_acosh_test1") { struct test tests[] = { @@ -118,10 +118,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + acosh_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + acosh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/testinfo.dat deleted file mode 100644 index e20077a9a89..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acosh/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = acosh -Name = Positive Test for acosh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the acosh() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/CMakeLists.txt deleted file mode 100644 index 3b692e35844..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_acoshf_test1 - ${SOURCES} -) - -add_dependencies(paltest_acoshf_test1 coreclrpal) - -target_link_libraries(paltest_acoshf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/test1.cpp index 6f6b7f59a86..78bab37dbf3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * acoshf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl acoshf_test1_validate(float value, float expected, float variance) { float result = acoshf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * acoshf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl acoshf_test1_validate_isnan(float value) { float result = acoshf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_acoshf_test1_paltest_acoshf_test1, "c_runtime/acoshf/test1/paltest_acoshf_test1") { struct test tests[] = { @@ -117,10 +117,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + acoshf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + acoshf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/testinfo.dat deleted file mode 100644 index c6968845412..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/acoshf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = acoshf -Name = Positive Test for acoshf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the acoshf() function, -= checking each for the expfected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt deleted file mode 100644 index 92ba84512d8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_asin_test1 - ${SOURCES} -) - -add_dependencies(paltest_asin_test1 coreclrpal) - -target_link_libraries(paltest_asin_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp index 4c185672131..b72599ad33d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * asin_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl asin_test1_validate(double value, double expected, double variance) { double result = asin(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * asin_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl asin_test1_validate_isnan(double value) { double result = asin(value); @@ -83,11 +83,11 @@ void __cdecl validate_isnan(double value) } /** - * validate + * asin_test1_validate * * test validation function for values returning +INF */ -void __cdecl validate_isinf_positive(double value) +void __cdecl asin_test1_validate_isinf_positive(double value) { double result = asin(value); @@ -103,7 +103,7 @@ void __cdecl validate_isinf_positive(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_asin_test1_paltest_asin_test1, "c_runtime/asin/test1/paltest_asin_test1") { struct test tests[] = { @@ -132,13 +132,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + asin_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + asin_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + asin_test1_validate_isnan(PAL_NEGINF); + asin_test1_validate_isnan(PAL_NAN); + asin_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/testinfo.dat deleted file mode 100644 index 54b0ac574da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asin/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = asin -Name = Positive Test for asin -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the asin() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt deleted file mode 100644 index 178bbe75933..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_asinf_test1 - ${SOURCES} -) - -add_dependencies(paltest_asinf_test1 coreclrpal) - -target_link_libraries(paltest_asinf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/test1.cpp index e249cb7f1e4..abf35c26185 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * asinf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl asinf_test1_validate(float value, float expected, float variance) { float result = asinf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * asinf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl asinf_test1_validate_isnan(float value) { float result = asinf(value); @@ -82,11 +82,11 @@ void __cdecl validate_isnan(float value) } /** - * validate + * asinf_test1_validate * * test validation function for values returning +INF */ -void __cdecl validate_isinf_positive(float value) +void __cdecl asinf_test1_validate_isinf_positive(float value) { float result = asinf(value); @@ -102,7 +102,7 @@ void __cdecl validate_isinf_positive(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_asinf_test1_paltest_asinf_test1, "c_runtime/asinf/test1/paltest_asinf_test1") { struct test tests[] = { @@ -131,13 +131,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + asinf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + asinf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + asinf_test1_validate_isnan(PAL_NEGINF); + asinf_test1_validate_isnan(PAL_NAN); + asinf_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/testinfo.dat deleted file mode 100644 index 2e6622d7a55..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = asinf -Name = Positive Test for asinf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the asinf() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/CMakeLists.txt deleted file mode 100644 index c1b9f952f88..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_asinh_test1 - ${SOURCES} -) - -add_dependencies(paltest_asinh_test1 coreclrpal) - -target_link_libraries(paltest_asinh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/test1.cpp index 28304f108d4..a0ed7953d2e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * asinh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl asinh_test1_validate(double value, double expected, double variance) { double result = asinh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * asinh_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl asinh_test1_validate_isnan(double value) { double result = asinh(value); @@ -83,11 +83,11 @@ void __cdecl validate_isnan(double value) } /** - * validate + * asinh_test1_validate * * test validation function for values returning +INF */ -void __cdecl validate_isinf_positive(double value) +void __cdecl asinh_test1_validate_isinf_positive(double value) { double result = asinh(value); @@ -103,7 +103,7 @@ void __cdecl validate_isinf_positive(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_asinh_test1_paltest_asinh_test1, "c_runtime/asinh/test1/paltest_asinh_test1") { struct test tests[] = { @@ -134,11 +134,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + asinh_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + asinh_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + asinh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/testinfo.dat deleted file mode 100644 index 87118690707..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinh/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = asinh -Name = Positive Test for asinh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the asinh() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/CMakeLists.txt deleted file mode 100644 index 92df683b802..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_asinhf_test1 - ${SOURCES} -) - -add_dependencies(paltest_asinhf_test1 coreclrpal) - -target_link_libraries(paltest_asinhf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/test1.cpp index d052781e584..eb2af42b98c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * asinhf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl asinhf_test1_validate(float value, float expected, float variance) { float result = asinhf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * asinhf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl asinhf_test1_validate_isnan(float value) { float result = asinhf(value); @@ -82,11 +82,11 @@ void __cdecl validate_isnan(float value) } /** - * validate + * asinhf_test1_validate * * test validation function for values returning +INF */ -void __cdecl validate_isinf_positive(float value) +void __cdecl asinhf_test1_validate_isinf_positive(float value) { float result = asinhf(value); @@ -102,7 +102,7 @@ void __cdecl validate_isinf_positive(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_asinhf_test1_paltest_asinhf_test1, "c_runtime/asinhf/test1/paltest_asinhf_test1") { struct test tests[] = { @@ -133,11 +133,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + asinhf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + asinhf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + asinhf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/testinfo.dat deleted file mode 100644 index 0e56de6faff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/asinhf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = asinhf -Name = Positive Test for asinhf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the asinhf() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt deleted file mode 100644 index 58290605291..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_atan_test1 - ${SOURCES} -) - -add_dependencies(paltest_atan_test1 coreclrpal) - -target_link_libraries(paltest_atan_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp index 8677c52acd8..0e65933bc89 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * atan_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl atan_test1_validate(double value, double expected, double variance) { double result = atan(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * atan_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl atan_test1_validate_isnan(double value) { double result = atan(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atan_test1_paltest_atan_test1, "c_runtime/atan/test1/paltest_atan_test1") { struct test tests[] = { @@ -116,11 +116,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + atan_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + atan_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + atan_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/testinfo.dat deleted file mode 100644 index e823c2d55a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atan -Name = Positive Test for atan -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the atan() function, -= checking each for the expected result. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt deleted file mode 100644 index 655c7012a00..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_atan2_test1 - ${SOURCES} -) - -add_dependencies(paltest_atan2_test1 coreclrpal) - -target_link_libraries(paltest_atan2_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp index 889ea90c9ca..6298487994d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp @@ -40,11 +40,11 @@ struct test }; /** - * validate + * atan2_test1_validate * * test validation function */ -void __cdecl validate(double y, double x, double expected, double variance) +void __cdecl atan2_test1_validate(double y, double x, double expected, double variance) { double result = atan2(y, x); @@ -62,11 +62,11 @@ void __cdecl validate(double y, double x, double expected, double variance) } /** - * validate + * atan2_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double y, double x) +void __cdecl atan2_test1_validate_isnan(double y, double x) { double result = atan2(y, x); @@ -82,7 +82,7 @@ void __cdecl validate_isnan(double y, double x) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atan2_test1_paltest_atan2_test1, "c_runtime/atan2/test1/paltest_atan2_test1") { struct test tests[] = { @@ -119,28 +119,28 @@ int __cdecl main(int argc, char **argv) { const double pi = 3.1415926535897932; - validate( tests[i].y, tests[i].x, tests[i].expected, tests[i].variance); - validate(-tests[i].y, tests[i].x, -tests[i].expected, tests[i].variance); - validate( tests[i].y, -tests[i].x, pi - tests[i].expected, tests[i].variance); - validate(-tests[i].y, -tests[i].x, tests[i].expected - pi, tests[i].variance); + atan2_test1_validate( tests[i].y, tests[i].x, tests[i].expected, tests[i].variance); + atan2_test1_validate(-tests[i].y, tests[i].x, -tests[i].expected, tests[i].variance); + atan2_test1_validate( tests[i].y, -tests[i].x, pi - tests[i].expected, tests[i].variance); + atan2_test1_validate(-tests[i].y, -tests[i].x, tests[i].expected - pi, tests[i].variance); } - validate_isnan(PAL_NEGINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NEGINF); - validate_isnan(PAL_NAN, PAL_POSINF); - validate_isnan(PAL_POSINF, PAL_NAN); + atan2_test1_validate_isnan(PAL_NEGINF, PAL_NAN); + atan2_test1_validate_isnan(PAL_NAN, PAL_NEGINF); + atan2_test1_validate_isnan(PAL_NAN, PAL_POSINF); + atan2_test1_validate_isnan(PAL_POSINF, PAL_NAN); - validate_isnan(PAL_NAN, -1); - validate_isnan(PAL_NAN, -0.0); - validate_isnan(PAL_NAN, 0); - validate_isnan(PAL_NAN, 1); + atan2_test1_validate_isnan(PAL_NAN, -1); + atan2_test1_validate_isnan(PAL_NAN, -0.0); + atan2_test1_validate_isnan(PAL_NAN, 0); + atan2_test1_validate_isnan(PAL_NAN, 1); - validate_isnan(-1, PAL_NAN); - validate_isnan(-0.0, PAL_NAN); - validate_isnan( 0, PAL_NAN); - validate_isnan( 1, PAL_NAN); + atan2_test1_validate_isnan(-1, PAL_NAN); + atan2_test1_validate_isnan(-0.0, PAL_NAN); + atan2_test1_validate_isnan( 0, PAL_NAN); + atan2_test1_validate_isnan( 1, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NAN); + atan2_test1_validate_isnan(PAL_NAN, PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/testinfo.dat deleted file mode 100644 index 45241063cc8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atan2 -Name = Test #1 for atan2 -Type = DEFAULT -EXE1 = test1 -Description -=Tests that atan2 returns correct values for a subset of values. -=Tests with positive and negative values of x and y to ensure -=atan2 is returning results from the correct quadrant. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt deleted file mode 100644 index d5b28ce4e6b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_atan2f_test1 - ${SOURCES} -) - -add_dependencies(paltest_atan2f_test1 coreclrpal) - -target_link_libraries(paltest_atan2f_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/test1.cpp index b00d4e55eee..f5915b3a0e1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/test1.cpp @@ -39,11 +39,11 @@ struct test }; /** - * validate + * atan2f_test1_validate * * test validation function */ -void __cdecl validate(float y, float x, float expected, float variance) +void __cdecl atan2f_test1_validate(float y, float x, float expected, float variance) { float result = atan2f(y, x); @@ -61,11 +61,11 @@ void __cdecl validate(float y, float x, float expected, float variance) } /** - * validate + * atan2f_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float y, float x) +void __cdecl atan2f_test1_validate_isnan(float y, float x) { float result = atan2f(y, x); @@ -81,7 +81,7 @@ void __cdecl validate_isnan(float y, float x) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atan2f_test1_paltest_atan2f_test1, "c_runtime/atan2f/test1/paltest_atan2f_test1") { struct test tests[] = { @@ -118,28 +118,28 @@ int __cdecl main(int argc, char **argv) { const float pi = 3.14159265f; - validate( tests[i].y, tests[i].x, tests[i].expected, tests[i].variance); - validate(-tests[i].y, tests[i].x, -tests[i].expected, tests[i].variance); - validate( tests[i].y, -tests[i].x, pi - tests[i].expected, tests[i].variance); - validate(-tests[i].y, -tests[i].x, tests[i].expected - pi, tests[i].variance); + atan2f_test1_validate( tests[i].y, tests[i].x, tests[i].expected, tests[i].variance); + atan2f_test1_validate(-tests[i].y, tests[i].x, -tests[i].expected, tests[i].variance); + atan2f_test1_validate( tests[i].y, -tests[i].x, pi - tests[i].expected, tests[i].variance); + atan2f_test1_validate(-tests[i].y, -tests[i].x, tests[i].expected - pi, tests[i].variance); } - validate_isnan(PAL_NEGINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NEGINF); - validate_isnan(PAL_NAN, PAL_POSINF); - validate_isnan(PAL_POSINF, PAL_NAN); + atan2f_test1_validate_isnan(PAL_NEGINF, PAL_NAN); + atan2f_test1_validate_isnan(PAL_NAN, PAL_NEGINF); + atan2f_test1_validate_isnan(PAL_NAN, PAL_POSINF); + atan2f_test1_validate_isnan(PAL_POSINF, PAL_NAN); - validate_isnan(PAL_NAN, -1); - validate_isnan(PAL_NAN, -0.0f); - validate_isnan(PAL_NAN, 0); - validate_isnan(PAL_NAN, 1); + atan2f_test1_validate_isnan(PAL_NAN, -1); + atan2f_test1_validate_isnan(PAL_NAN, -0.0f); + atan2f_test1_validate_isnan(PAL_NAN, 0); + atan2f_test1_validate_isnan(PAL_NAN, 1); - validate_isnan(-1, PAL_NAN); - validate_isnan(-0.0f, PAL_NAN); - validate_isnan( 0, PAL_NAN); - validate_isnan( 1, PAL_NAN); + atan2f_test1_validate_isnan(-1, PAL_NAN); + atan2f_test1_validate_isnan(-0.0f, PAL_NAN); + atan2f_test1_validate_isnan( 0, PAL_NAN); + atan2f_test1_validate_isnan( 1, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NAN); + atan2f_test1_validate_isnan(PAL_NAN, PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/testinfo.dat deleted file mode 100644 index 225a3c7b4fc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atan2f/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atan2f -Name = Test #1 for atan2f -Type = DEFAULT -EXE1 = test1 -Description -=Tests that atan2f returns correct values for a subset of values. -=Tests with positive and negative values of x and y to ensure -=atan2f is returning results from the correct quadrant. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt deleted file mode 100644 index 70df46a7990..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_atanf_test1 - ${SOURCES} -) - -add_dependencies(paltest_atanf_test1 coreclrpal) - -target_link_libraries(paltest_atanf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/test1.cpp index 3d460d3e25c..518775f1f9c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * atanf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl atanf_test1_validate(float value, float expected, float variance) { float result = atanf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * atanf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl atanf_test1_validate_isnan(float value) { float result = atanf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atanf_test1_paltest_atanf_test1, "c_runtime/atanf/test1/paltest_atanf_test1") { struct test tests[] = { @@ -115,11 +115,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + atanf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + atanf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + atanf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/testinfo.dat deleted file mode 100644 index 4924a2a15d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atanf -Name = Positive Test for atanf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the atanf() function, -= checking each for the expected result. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/CMakeLists.txt deleted file mode 100644 index e55fc35c1b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_atanh_test1 - ${SOURCES} -) - -add_dependencies(paltest_atanh_test1 coreclrpal) - -target_link_libraries(paltest_atanh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/test1.cpp index 3531e765ff8..24a042826e0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * atanh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl atanh_test1_validate(double value, double expected, double variance) { double result = atanh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * atanh_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl atanh_test1_validate_isnan(double value) { double result = atanh(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atanh_test1_paltest_atanh_test1, "c_runtime/atanh/test1/paltest_atanh_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + atanh_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + atanh_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + atanh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/testinfo.dat deleted file mode 100644 index 32a68acb851..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanh/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atanh -Name = Positive Test for atanh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the atanh() function, -= checking each for the expected result. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/CMakeLists.txt deleted file mode 100644 index 88e7a36b48b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_atanhf_test1 - ${SOURCES} -) - -add_dependencies(paltest_atanhf_test1 coreclrpal) - -target_link_libraries(paltest_atanhf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/test1.cpp index 3c3a156035a..d8d184f905f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * atanhf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl atanhf_test1_validate(float value, float expected, float variance) { float result = atanhf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * atanhf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl atanhf_test1_validate_isnan(float value) { float result = atanhf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atanhf_test1_paltest_atanhf_test1, "c_runtime/atanhf/test1/paltest_atanhf_test1") { struct test tests[] = { @@ -117,11 +117,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + atanhf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + atanhf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + atanhf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/testinfo.dat deleted file mode 100644 index 4f8217652a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atanhf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atanhf -Name = Positive Test for atanhf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the atanhf() function, -= checking each for the expected result. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt deleted file mode 100644 index dbc898a8aaa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_atof_test1 - ${SOURCES} -) - -add_dependencies(paltest_atof_test1 coreclrpal) - -target_link_libraries(paltest_atof_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp index e708d7a42fb..6d8becb3d95 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp @@ -20,7 +20,7 @@ struct testCase char avalue[20]; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atof_test1_paltest_atof_test1, "c_runtime/atof/test1/paltest_atof_test1") { int i = 0; double f = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/testinfo.dat deleted file mode 100644 index d108278e93b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atof/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atof -Name = Positive Test for atof -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to atof() a series of strings containing floats, checking that -= each one is correctly extracted. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt deleted file mode 100644 index 92426e1d9ff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_atoi_test1 - ${SOURCES} -) - -add_dependencies(paltest_atoi_test1 coreclrpal) - -target_link_libraries(paltest_atoi_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp index 38e42862cc4..3137bf903e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase char avalue[20]; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_atoi_test1_paltest_atoi_test1, "c_runtime/atoi/test1/paltest_atoi_test1") { int result=0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/testinfo.dat deleted file mode 100644 index 161812238f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/atoi/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = atoi -Name = Positive Test for atoi -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the atoi function. -= Check to ensure that the different ints (normal, negative, decimal, -= exponent), all work as expected with this function. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt deleted file mode 100644 index c24a88cf0c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_bsearch_test1 - ${SOURCES} -) - -add_dependencies(paltest_bsearch_test1 coreclrpal) - -target_link_libraries(paltest_bsearch_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp index b00ec283212..eacb660dee0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp @@ -13,12 +13,12 @@ #include <palsuite.h> -int __cdecl charcmp(const void *pa, const void *pb) +int __cdecl charcmp_bsearch_test1(const void *pa, const void *pb) { return memcmp(pa, pb, 1); } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_bsearch_test1_paltest_bsearch_test1, "c_runtime/bsearch/test1/paltest_bsearch_test1") { const char array[] = "abcdefghij"; @@ -33,7 +33,7 @@ int __cdecl main(int argc, char **argv) } found = (char *)bsearch(&"d", array, sizeof(array) - 1, (sizeof(char)) - , charcmp); + , charcmp_bsearch_test1); if (found != array + 3) { Fail ("bsearch was unable to find a specified character in a " diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/testinfo.dat deleted file mode 100644 index eaae5e0add9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = bsearch -Name = Positive Test for bsearch -TYPE = DEFAULT -EXE1 = test1 -Description -= Calls bsearch to find a character in a sorted buffer, and -= verifies that the correct position is returned. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt deleted file mode 100644 index 3f86291bb38..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_bsearch_test2 - ${SOURCES} -) - -add_dependencies(paltest_bsearch_test2 coreclrpal) - -target_link_libraries(paltest_bsearch_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp index 08440728c06..a916e61362e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp @@ -13,12 +13,12 @@ #include <palsuite.h> -int __cdecl charcmp(const void *pa, const void *pb) +int __cdecl charcmp_bsearch_test2(const void *pa, const void *pb) { return *(const char *)pa - *(const char *)pb; } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_bsearch_test2_paltest_bsearch_test2, "c_runtime/bsearch/test2/paltest_bsearch_test2") { const char array[] = "abcefghij"; @@ -36,7 +36,7 @@ int __cdecl main(int argc, char **argv) while (*candidate) { found = (char *)bsearch(candidate, array, sizeof(array) - 1, - (sizeof(char)), charcmp); + (sizeof(char)), charcmp_bsearch_test2); if (found != NULL) { Fail ("ERROR: bsearch was able to find a specified character '%c' " diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/testinfo.dat deleted file mode 100644 index 4d149e26a4f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/bsearch/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = bsearch -Name = Negative Test for bsearch -TYPE = DEFAULT -EXE1 = test2 -Description -= Calls bsearch to find a character in a sorted buffer, -= that does not exist. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/CMakeLists.txt deleted file mode 100644 index e53845485e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_cbrt_test1 - ${SOURCES} -) - -add_dependencies(paltest_cbrt_test1 coreclrpal) - -target_link_libraries(paltest_cbrt_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/test1.cpp index aca178fc1af..157bc0b1495 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/test1.cpp @@ -42,11 +42,11 @@ struct test }; /** - * validate + * cbrt_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl cbrt_test1_validate(double value, double expected, double variance) { double result = cbrt(value); @@ -64,11 +64,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * cbrt_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl cbrt_test1_validate_isnan(double value) { double result = cbrt(value); @@ -79,7 +79,7 @@ void __cdecl validate_isnan(double value) } } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_cbrt_test1_paltest_cbrt_test1, "c_runtime/cbrt/test1/paltest_cbrt_test1") { struct test tests[] = { @@ -106,16 +106,16 @@ int __cdecl main(int argc, char **argv) return FAIL; } - validate(-0.0, -0.0, PAL_EPSILON); - validate( 0.0, 0.0, PAL_EPSILON); + cbrt_test1_validate(-0.0, -0.0, PAL_EPSILON); + cbrt_test1_validate( 0.0, 0.0, PAL_EPSILON); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + cbrt_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); + cbrt_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + cbrt_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/testinfo.dat deleted file mode 100644 index 03981d2f153..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrt/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = cbrt -Name = Call cbrt on positive values and zero. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the cbrt function on a positive value, a positive value -= with a decimal and on the maxium possible double value. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/CMakeLists.txt deleted file mode 100644 index 1d909e076c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_cbrtf_test1 - ${SOURCES} -) - -add_dependencies(paltest_cbrtf_test1 coreclrpal) - -target_link_libraries(paltest_cbrtf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/test1.cpp index a4acb920d7d..2fa3f25a467 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/test1.cpp @@ -41,11 +41,11 @@ struct test }; /** - * validate + * cbrtf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl cbrtf_test1_validate(float value, float expected, float variance) { float result = cbrtf(value); @@ -63,11 +63,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * cbrtf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl cbrtf_test1_validate_isnan(float value) { float result = cbrtf(value); @@ -78,7 +78,7 @@ void __cdecl validate_isnan(float value) } } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_cbrtf_test1_paltest_cbrtf_test1, "c_runtime/cbrtf/test1/paltest_cbrtf_test1") { struct test tests[] = { @@ -105,16 +105,16 @@ int __cdecl main(int argc, char **argv) return FAIL; } - validate(-0.0f, -0.0f, PAL_EPSILON); - validate( 0.0f, 0.0f, PAL_EPSILON); + cbrtf_test1_validate(-0.0f, -0.0f, PAL_EPSILON); + cbrtf_test1_validate( 0.0f, 0.0f, PAL_EPSILON); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + cbrtf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); + cbrtf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + cbrtf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/testinfo.dat deleted file mode 100644 index 73264ba8478..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cbrtf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = cbrtf -Name = Call cbrtf on positive values and zero. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the cbrtf function on a positive value, a positive value -= with a decimal and on the maxium possible float value. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt deleted file mode 100644 index 10c9045af8d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_ceil_test1 - ${SOURCES} -) - -add_dependencies(paltest_ceil_test1 coreclrpal) - -target_link_libraries(paltest_ceil_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp index 594c4d79479..3f1d71e625c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp @@ -43,11 +43,11 @@ struct test }; /** - * validate + * ceil_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl ceil_test1_validate(double value, double expected, double variance) { double result = ceil(value); @@ -65,11 +65,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * ceil_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl ceil_test1_validate_isnan(double value) { double result = ceil(value); @@ -85,7 +85,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_ceil_test1_paltest_ceil_test1, "c_runtime/ceil/test1/paltest_ceil_test1") { struct test tests[] = { @@ -112,19 +112,19 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - validate( 0, 0, PAL_EPSILON); - validate(-0.0, 0, PAL_EPSILON); + ceil_test1_validate( 0, 0, PAL_EPSILON); + ceil_test1_validate(-0.0, 0, PAL_EPSILON); - validate( 1, 1, PAL_EPSILON * 10); - validate(-1.0, -1, PAL_EPSILON * 10); + ceil_test1_validate( 1, 1, PAL_EPSILON * 10); + ceil_test1_validate(-1.0, -1, PAL_EPSILON * 10); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, 1 - tests[i].expected, tests[i].variance); + ceil_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + ceil_test1_validate(-tests[i].value, 1 - tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + ceil_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/testinfo.dat deleted file mode 100644 index e3a13421a13..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceil/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ceil -Name = Test #1 for ceil -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests ceil with simple positive and negative values. Also tests -=extreme cases like extremely small values and positive and negative -=infinity. Makes sure that calling ceil on NaN returns NaN diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt deleted file mode 100644 index ecfef17c3dc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_ceilf_test1 - ${SOURCES} -) - -add_dependencies(paltest_ceilf_test1 coreclrpal) - -target_link_libraries(paltest_ceilf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/test1.cpp index 2b3534dd830..cf237ea8eb9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/test1.cpp @@ -42,11 +42,11 @@ struct test }; /** - * validate + * ceilf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl ceilf_test1_validate(float value, float expected, float variance) { float result = ceilf(value); @@ -64,11 +64,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * ceilf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl ceilf_test1_validate_isnan(float value) { float result = ceilf(value); @@ -84,7 +84,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_ceilf_test1_paltest_ceilf_test1, "c_runtime/ceilf/test1/paltest_ceilf_test1") { struct test tests[] = { @@ -111,19 +111,19 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - validate( 0, 0, PAL_EPSILON); - validate(-0.0f, 0, PAL_EPSILON); + ceilf_test1_validate( 0, 0, PAL_EPSILON); + ceilf_test1_validate(-0.0f, 0, PAL_EPSILON); - validate( 1, 1, PAL_EPSILON * 10); - validate(-1.0f, -1, PAL_EPSILON * 10); + ceilf_test1_validate( 1, 1, PAL_EPSILON * 10); + ceilf_test1_validate(-1.0f, -1, PAL_EPSILON * 10); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, 1 - tests[i].expected, tests[i].variance); + ceilf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + ceilf_test1_validate(-tests[i].value, 1 - tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + ceilf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/testinfo.dat deleted file mode 100644 index c10be6890b1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ceilf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ceilf -Name = Test #1 for ceilf -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests ceilf with simple positive and negative values. Also tests -=extreme cases like extremely small values and positive and negative -=infinity. Makes sure that calling ceilf on NaN returns NaN diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt deleted file mode 100644 index 6ca4befb878..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_cos_test1 - ${SOURCES} -) - -add_dependencies(paltest_cos_test1 coreclrpal) - -target_link_libraries(paltest_cos_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp index ffbd61bdcb1..d574895731d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * cos_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl cos_test1_validate(double value, double expected, double variance) { double result = cos(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * cos_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl cos_test1_validate_isnan(double value) { double result = cos(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_cos_test1_paltest_cos_test1, "c_runtime/cos/test1/paltest_cos_test1") { struct test tests[] = { @@ -117,13 +117,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + cos_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + cos_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + cos_test1_validate_isnan(PAL_NEGINF); + cos_test1_validate_isnan(PAL_NAN); + cos_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/testinfo.dat deleted file mode 100644 index 39a176459fd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cos/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = cos -Name = Positive Test for cos -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to cos() a series of angle value, checking that -= each one return the correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt deleted file mode 100644 index bf3756cfeac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_cosf_test1 - ${SOURCES} -) - -add_dependencies(paltest_cosf_test1 coreclrpal) - -target_link_libraries(paltest_cosf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/test1.cpp index d9c75152c18..ed3a4512b7f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * cosf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl cosf_test1_validate(float value, float expected, float variance) { float result = cosf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * cosf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl cosf_test1_validate_isnan(float value) { float result = cosf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_cosf_test1_paltest_cosf_test1, "c_runtime/cosf/test1/paltest_cosf_test1") { struct test tests[] = { @@ -116,13 +116,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + cosf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + cosf_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + cosf_test1_validate_isnan(PAL_NEGINF); + cosf_test1_validate_isnan(PAL_NAN); + cosf_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/testinfo.dat deleted file mode 100644 index f6596c47bac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = cosf -Name = Positive Test for cosf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to cosf() a series of angle value, checking that -= each one return the correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt deleted file mode 100644 index daa88d205a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_cosh_test1 - ${SOURCES} -) - -add_dependencies(paltest_cosh_test1 coreclrpal) - -target_link_libraries(paltest_cosh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp index 4c23816621a..78518b78e0e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * cosh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl cosh_test1_validate(double value, double expected, double variance) { double result = cosh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * cosh_test1_validate * * test validation function for values returning PAL_NAN */ -void __cdecl validate_isnan(double value) +void __cdecl cosh_test1_validate_isnan(double value) { double result = cosh(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_cosh_test1_paltest_cosh_test1, "c_runtime/cosh/test1/paltest_cosh_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + cosh_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + cosh_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + cosh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/testinfo.dat deleted file mode 100644 index 1308e92e3a4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/cosh/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = cosh -Name = Positive Test for cosh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to cosh() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt deleted file mode 100644 index 0754fad0dbd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_coshf_test1 - ${SOURCES} -) - -add_dependencies(paltest_coshf_test1 coreclrpal) - -target_link_libraries(paltest_coshf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/test1.cpp index f62e7377420..27ba18c080f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * coshf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl coshf_test1_validate(float value, float expected, float variance) { float result = coshf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * coshf_test1_validate * * test validation function for values returning PAL_NAN */ -void __cdecl validate_isnan(float value) +void __cdecl coshf_test1_validate_isnan(float value) { float result = coshf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_coshf_test1_paltest_coshf_test1, "c_runtime/coshf/test1/paltest_coshf_test1") { struct test tests[] = { @@ -117,11 +117,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + coshf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + coshf_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + coshf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/testinfo.dat deleted file mode 100644 index a953630cda9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/coshf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = coshf -Name = Positive Test for coshf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to coshf() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt deleted file mode 100644 index d5968e08952..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_errno_test1 - ${SOURCES} -) - -add_dependencies(paltest_errno_test1 coreclrpal) - -target_link_libraries(paltest_errno_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp index 0a7da4a644c..7daab481ef1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_errno_test1_paltest_errno_test1, "c_runtime/errno/test1/paltest_errno_test1") { WCHAR overstr[] = {'4','2','9','4','9','6','7','2','9','6',0}; WCHAR *end; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/testinfo.dat deleted file mode 100644 index 21bcff79efc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = errno -Name = Positive Test for errno -TYPE = DEFAULT -EXE1 = test1 -Description -= Test that errno begins as 0, and sets to ERANGE when that -= error is forced with wcstoul. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt deleted file mode 100644 index ebb4b65dde3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_errno_test2 - ${SOURCES} -) - -add_dependencies(paltest_errno_test2 coreclrpal) - -target_link_libraries(paltest_errno_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp index 2c5e42d0059..7a0e27007f7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp @@ -16,7 +16,7 @@ This thread function just checks that errno is initially 0 and then sets it to a new value before returning. */ -DWORD PALAPI ThreadFunc( LPVOID lpParam ) +DWORD PALAPI ThreadFunc_errno_test2( LPVOID lpParam ) { if(errno != 0) @@ -30,7 +30,7 @@ DWORD PALAPI ThreadFunc( LPVOID lpParam ) } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_errno_test2_paltest_errno_test2, "c_runtime/errno/test2/paltest_errno_test2") { DWORD dwThreadId, dwThrdParam = 0; HANDLE hThread; @@ -45,7 +45,7 @@ int __cdecl main(int argc, char *argv[]) errno = 50; - hThread = CreateThread(NULL, 0, ThreadFunc, &dwThrdParam, 0, &dwThreadId); + hThread = CreateThread(NULL, 0, ThreadFunc_errno_test2, &dwThrdParam, 0, &dwThreadId); if (hThread == NULL) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/testinfo.dat deleted file mode 100644 index 1b79738d96a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/errno/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = errno -Name = Positive Test for errno -TYPE = DEFAULT -EXE1 = test2 -Description -= Test that errno is 'per-thread' as noted in the documentation. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt deleted file mode 100644 index 0bfd0d0192e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_exit_test1 - ${SOURCES} -) - -add_dependencies(paltest_exit_test1 coreclrpal) - -target_link_libraries(paltest_exit_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp index 201e798e909..2bb42e3563c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_exit_test1_paltest_exit_test1, "c_runtime/exit/test1/paltest_exit_test1") { /* * Initialize the PAL and return FAIL if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/testinfo.dat deleted file mode 100644 index 8ee95bdcb9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = exit -Name = Positive Test for exit -TYPE = DEFAULT -EXE1 = test1 -Description -= Calls exit, and verifies that it actually stops program execution. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt deleted file mode 100644 index 216befb0779..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_exit_test2 - ${SOURCES} -) - -add_dependencies(paltest_exit_test2 coreclrpal) - -target_link_libraries(paltest_exit_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp index c5cb862740e..6125b3c3889 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_exit_test2_paltest_exit_test2, "c_runtime/exit/test2/paltest_exit_test2") { /* * Initialize the PAL and return FAIL if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/testinfo.dat deleted file mode 100644 index c913ec69464..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exit/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = exit -Name = Positive Test for exit -TYPE = DEFAULT -EXE1 = test2 -Description -= Calls exit on fail, and verifies that it actually stops program execution, -= and return 1. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt deleted file mode 100644 index 1830cc2ca7a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_exp_test1 - ${SOURCES} -) - -add_dependencies(paltest_exp_test1 coreclrpal) - -target_link_libraries(paltest_exp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp index c18e31b9783..b3c8bb9307e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp @@ -40,11 +40,11 @@ struct test }; /** - * validate + * exp_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl exp_test1_validate(double value, double expected, double variance) { double result = exp(value); @@ -62,11 +62,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * exp_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl exp_test1_validate_isnan(double value) { double result = exp(value); @@ -82,7 +82,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_exp_test1_paltest_exp_test1, "c_runtime/exp/test1/paltest_exp_test1") { struct test tests[] = { @@ -127,10 +127,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + exp_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + exp_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/testinfo.dat deleted file mode 100644 index 9014536f501..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/exp/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = exp -Name = Test #1 for exp -Type = DEFAULT -EXE1 = test1 -Description -=Tests exp with a normal set of values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt deleted file mode 100644 index f598831ec06..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_expf_test1 - ${SOURCES} -) - -add_dependencies(paltest_expf_test1 coreclrpal) - -target_link_libraries(paltest_expf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/test1.cpp index 1ef28a44085..72d417ff180 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/test1.cpp @@ -39,11 +39,11 @@ struct test }; /** - * validate + * expf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl expf_test1_validate(float value, float expected, float variance) { float result = expf(value); @@ -61,11 +61,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * expf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl expf_test1_validate_isnan(float value) { float result = expf(value); @@ -81,7 +81,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_expf_test1_paltest_expf_test1, "c_runtime/expf/test1/paltest_expf_test1") { struct test tests[] = { @@ -126,10 +126,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + expf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + expf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/testinfo.dat deleted file mode 100644 index 9ed119e1297..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/expf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = expf -Name = Test #1 for expf -Type = DEFAULT -EXE1 = test1 -Description -=Tests expf with a normal set of values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt deleted file mode 100644 index c3d4d81a3c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fabs_test1 - ${SOURCES} -) - -add_dependencies(paltest_fabs_test1 coreclrpal) - -target_link_libraries(paltest_fabs_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp index e505a21d3bb..f3997dea019 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * fabs_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl fabs_test1_validate(double value, double expected, double variance) { double result = fabs(value); @@ -66,11 +66,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * fabs_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl fabs_test1_validate_isnan(double value) { double result = fabs(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -INT __cdecl main(INT argc, CHAR **argv) +PALTEST(c_runtime_fabs_test1_paltest_fabs_test1, "c_runtime/fabs/test1/paltest_fabs_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ INT __cdecl main(INT argc, CHAR **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + fabs_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + fabs_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + fabs_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/testinfo.dat deleted file mode 100644 index 41ba9d82fba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabs/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fabs -Name = Positive Test for fabs -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to fabs() a series of values, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt deleted file mode 100644 index df01190dc0a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fabsf_test1 - ${SOURCES} -) - -add_dependencies(paltest_fabsf_test1 coreclrpal) - -target_link_libraries(paltest_fabsf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp index db46814c87a..68481ca97ce 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * fabsf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl fabsf_test1_validate(float value, float expected, float variance) { float result = fabsf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * fabsf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl fabsf_test1_validate_isnan(float value) { float result = fabsf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -INT __cdecl main(INT argc, CHAR **argv) +PALTEST(c_runtime_fabsf_test1_paltest_fabsf_test1, "c_runtime/fabsf/test1/paltest_fabsf_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ INT __cdecl main(INT argc, CHAR **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, tests[i].expected, tests[i].variance); + fabsf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + fabsf_test1_validate(-tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + fabsf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/testinfo.dat deleted file mode 100644 index e58a7b95df1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fabsf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fabsf -Name = Positive Test for fabsf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to fabsf() a series of values, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt deleted file mode 100644 index 907694baf18..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fclose_test1 - ${SOURCES} -) - -add_dependencies(paltest_fclose_test1 coreclrpal) - -target_link_libraries(paltest_fclose_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp index 9771dc5e311..fe615787c72 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fclose_test1_paltest_fclose_test1, "c_runtime/fclose/test1/paltest_fclose_test1") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/testinfo.dat deleted file mode 100644 index 8854bfb0eeb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fclose -Name = Test for fclose -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the fclose function. -= This test will use fdopen to create a file stream, -= that will be used to test fclose. fclose will also -= be passed a closed file handle to make sure it handle -= it accordingly. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt deleted file mode 100644 index e3cf723eff1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fclose_test2 - ${SOURCES} -) - -add_dependencies(paltest_fclose_test2 coreclrpal) - -target_link_libraries(paltest_fclose_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp index 0ba28848589..d27349a2448 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fclose_test2_paltest_fclose_test2, "c_runtime/fclose/test2/paltest_fclose_test2") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/testinfo.dat deleted file mode 100644 index d487fec7415..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fclose/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fclose -Name = Test for fclose -TYPE = DEFAULT -EXE1 = test2 -LANG = cpp -Description -= Tests the PAL implementation of the fclose function. -= fclose will be passed a closed file handle to -= make sure it handles it accordingly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt deleted file mode 100644 index a492a643a67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_ferror_test1 - ${SOURCES} -) - -add_dependencies(paltest_ferror_test1 coreclrpal) - -target_link_libraries(paltest_ferror_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp index dbc8a6e240f..5863d51d0c0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_ferror_test1_paltest_ferror_test1, "c_runtime/ferror/test1/paltest_ferror_test1") { const char filename[] = "testfile"; char buffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat deleted file mode 100644 index eba507af4ab..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ferror -Name = Positive Test for ferror -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the ferror function. -= Open a file, and read some characters. Check that ferror states that -= no error has occurred. Then close the file pointer. Attempt to read -= some more. Check ferror now, and it should indicate that an error has -= occurred. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt deleted file mode 100644 index 313ad09d3d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_ferror_test2 - ${SOURCES} -) - -add_dependencies(paltest_ferror_test2 coreclrpal) - -target_link_libraries(paltest_ferror_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp index 2e597e78885..3ac444b0ec3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_ferror_test2_paltest_ferror_test2, "c_runtime/ferror/test2/paltest_ferror_test2") { const char filename[] = "testfile"; FILE * fp = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/testinfo.dat deleted file mode 100644 index c230d300963..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ferror/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ferror -Name = Positive Test for ferror, call write on a readonly file. -TYPE = DEFAULT -EXE1 = test2 -Description -= Open a read-only file and attempt to write some data to it. -= Check to ensure that an ferror occurs. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt deleted file mode 100644 index 807a5c3bbde..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fflush_test1 - ${SOURCES} -) - -add_dependencies(paltest_fflush_test1 coreclrpal) - -target_link_libraries(paltest_fflush_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp index d9a22dae857..716a151b5f8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fflush_test1_paltest_fflush_test1, "c_runtime/fflush/test1/paltest_fflush_test1") { int TheReturn; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/testinfo.dat deleted file mode 100644 index 1bde5c32bac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fflush/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fflush -Name = Positive Test for fflush -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests to see that fflush is working properly. Flushes a couple -= buffers and checks the return value. Can't figure out a way to test -= and ensure it is really dropping the buffers, since the system -= does this automatically most of the time ... diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt deleted file mode 100644 index 3fc2acbd717..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fgets_test1 - ${SOURCES} -) - -add_dependencies(paltest_fgets_test1 coreclrpal) - -target_link_libraries(paltest_fgets_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp index 55759e9e9b4..e16c9e2ad9d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fgets_test1_paltest_fgets_test1, "c_runtime/fgets/test1/paltest_fgets_test1") { const char outBuf1[] = "This is a test.\n"; const char outBuf2[] = "This is too."; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/testinfo.dat deleted file mode 100644 index f319b9445a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fgets -Name = Positive Test for fgets -TYPE = DEFAULT -EXE1 = test1 -Description -= Writes a simple file and calls fgets() to get a string shorter than -= the first line of the file. Verifies that the correct string is -= returned. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt deleted file mode 100644 index 240ec613d70..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fgets_test2 - ${SOURCES} -) - -add_dependencies(paltest_fgets_test2 coreclrpal) - -target_link_libraries(paltest_fgets_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp index 36c21fc56bb..7f21d075817 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fgets_test2_paltest_fgets_test2, "c_runtime/fgets/test2/paltest_fgets_test2") { const char outBuf1[] = "This is a test.\n"; const char outBuf2[] = "This is too."; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/testinfo.dat deleted file mode 100644 index 8687e6aedcf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fgets -Name = Positive Test for fgets -TYPE = DEFAULT -EXE1 = test2 -Description -= Calls fgets to read a full line from a file. A maximum length -= parameter greater than the length of the line is passed. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt deleted file mode 100644 index 57e774ed9b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_fgets_test3 - ${SOURCES} -) - -add_dependencies(paltest_fgets_test3 coreclrpal) - -target_link_libraries(paltest_fgets_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp index bf8074f4a4a..f46b179de1d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fgets_test3_paltest_fgets_test3, "c_runtime/fgets/test3/paltest_fgets_test3") { char inBuf[10]; const char filename[] = "testfile.tmp"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/testinfo.dat deleted file mode 100644 index f4549d91733..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fgets/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fgets -Name = Positive Test for fgets -TYPE = DEFAULT -EXE1 = test3 -Description -= Tries to read from an empty file using fgets(), to verify handling of -= EOF condition. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt deleted file mode 100644 index 4a7631516ce..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_floor_test1 - ${SOURCES} -) - -add_dependencies(paltest_floor_test1 coreclrpal) - -target_link_libraries(paltest_floor_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp index a9837bfcd55..549a2d83a0d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp @@ -43,11 +43,11 @@ struct test }; /** - * validate + * floor_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl floor_test1_validate(double value, double expected, double variance) { double result = floor(value); @@ -65,11 +65,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * floor_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl floor_test1_validate_isnan(double value) { double result = floor(value); @@ -85,7 +85,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_floor_test1_paltest_floor_test1, "c_runtime/floor/test1/paltest_floor_test1") { struct test tests[] = { @@ -112,19 +112,19 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - validate( 0, 0, PAL_EPSILON); - validate(-0.0, 0, PAL_EPSILON); + floor_test1_validate( 0, 0, PAL_EPSILON); + floor_test1_validate(-0.0, 0, PAL_EPSILON); - validate( 1, 1, PAL_EPSILON * 10); - validate(-1.0, -1, PAL_EPSILON * 10); + floor_test1_validate( 1, 1, PAL_EPSILON * 10); + floor_test1_validate(-1.0, -1, PAL_EPSILON * 10); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -(tests[i].expected + 1), tests[i].variance); + floor_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + floor_test1_validate(-tests[i].value, -(tests[i].expected + 1), tests[i].variance); } - validate_isnan(PAL_NAN); + floor_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/testinfo.dat deleted file mode 100644 index 250ad8a2842..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floor/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = floor -Name = Positive Test for floor -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to floor() a series of value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt deleted file mode 100644 index 37411564396..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_floorf_test1 - ${SOURCES} -) - -add_dependencies(paltest_floorf_test1 coreclrpal) - -target_link_libraries(paltest_floorf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/test1.cpp index 0a1e722e080..b80320c7de3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/test1.cpp @@ -42,11 +42,11 @@ struct test }; /** - * validate + * floorf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl floorf_test1_validate(float value, float expected, float variance) { float result = floorf(value); @@ -64,11 +64,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * floorf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl floorf_test1_validate_isnan(float value) { float result = floorf(value); @@ -84,7 +84,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_floorf_test1_paltest_floorf_test1, "c_runtime/floorf/test1/paltest_floorf_test1") { struct test tests[] = { @@ -111,19 +111,19 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - validate( 0, 0, PAL_EPSILON); - validate(-0.0f, 0, PAL_EPSILON); + floorf_test1_validate( 0, 0, PAL_EPSILON); + floorf_test1_validate(-0.0f, 0, PAL_EPSILON); - validate( 1, 1, PAL_EPSILON * 10); - validate(-1.0f, -1, PAL_EPSILON * 10); + floorf_test1_validate( 1, 1, PAL_EPSILON * 10); + floorf_test1_validate(-1.0f, -1, PAL_EPSILON * 10); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -(tests[i].expected + 1), tests[i].variance); + floorf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + floorf_test1_validate(-tests[i].value, -(tests[i].expected + 1), tests[i].variance); } - validate_isnan(PAL_NAN); + floorf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/testinfo.dat deleted file mode 100644 index b64c1789f4e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/floorf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = floorf -Name = Positive Test for floorf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to floorf() a series of value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/CMakeLists.txt deleted file mode 100644 index 0bb96a360c8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fma_test1 - ${SOURCES} -) - -add_dependencies(paltest_fma_test1 coreclrpal) - -target_link_libraries(paltest_fma_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/test1.cpp index 67aced02535..a82adc4b6ca 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * fma_test1_validate * * test validation function */ -void __cdecl validate(double x, double y, double z, double expected, double variance) +void __cdecl fma_test1_validate(double x, double y, double z, double expected, double variance) { double result = fma(x, y, z); @@ -66,11 +66,11 @@ void __cdecl validate(double x, double y, double z, double expected, double vari } /** - * validate + * fma_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double x, double y, double z) +void __cdecl fma_test1_validate_isnan(double x, double y, double z) { double result = fma(x, y, z); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(double x, double y, double z) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fma_test1_paltest_fma_test1, "c_runtime/fma/test1/paltest_fma_test1") { struct test tests[] = { @@ -104,41 +104,41 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].x, tests[i].y, tests[i].z, tests[i].expected, tests[i].variance); + fma_test1_validate(tests[i].x, tests[i].y, tests[i].z, tests[i].expected, tests[i].variance); } // Returns NaN if x or y is infinite, the other is zero, and z is NaN - validate_isnan(PAL_NEGINF, 0, PAL_NAN); - validate_isnan(PAL_POSINF, 0, PAL_NAN); - validate_isnan(0, PAL_NEGINF, PAL_NAN); - validate_isnan(0, PAL_POSINF, PAL_NAN); + fma_test1_validate_isnan(PAL_NEGINF, 0, PAL_NAN); + fma_test1_validate_isnan(PAL_POSINF, 0, PAL_NAN); + fma_test1_validate_isnan(0, PAL_NEGINF, PAL_NAN); + fma_test1_validate_isnan(0, PAL_POSINF, PAL_NAN); // Returns NaN if x or y is infinite, the other is zero, and z is not-NaN - validate_isnan(PAL_POSINF, 0, PAL_NEGINF); - validate_isnan(PAL_NEGINF, 0, PAL_NEGINF); - validate_isnan(0, PAL_POSINF, PAL_NEGINF); - validate_isnan(0, PAL_NEGINF, PAL_NEGINF); + fma_test1_validate_isnan(PAL_POSINF, 0, PAL_NEGINF); + fma_test1_validate_isnan(PAL_NEGINF, 0, PAL_NEGINF); + fma_test1_validate_isnan(0, PAL_POSINF, PAL_NEGINF); + fma_test1_validate_isnan(0, PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, 0, 0); - validate_isnan(PAL_NEGINF, 0, 0); - validate_isnan(0, PAL_POSINF, 0); - validate_isnan(0, PAL_NEGINF, 0); + fma_test1_validate_isnan(PAL_POSINF, 0, 0); + fma_test1_validate_isnan(PAL_NEGINF, 0, 0); + fma_test1_validate_isnan(0, PAL_POSINF, 0); + fma_test1_validate_isnan(0, PAL_NEGINF, 0); - validate_isnan(PAL_POSINF, 0, PAL_POSINF); - validate_isnan(PAL_NEGINF, 0, PAL_POSINF); - validate_isnan(0, PAL_POSINF, PAL_POSINF); - validate_isnan(0, PAL_NEGINF, PAL_POSINF); + fma_test1_validate_isnan(PAL_POSINF, 0, PAL_POSINF); + fma_test1_validate_isnan(PAL_NEGINF, 0, PAL_POSINF); + fma_test1_validate_isnan(0, PAL_POSINF, PAL_POSINF); + fma_test1_validate_isnan(0, PAL_NEGINF, PAL_POSINF); // Returns NaN if (x * y) is infinite, and z is an infinite of the opposite sign - validate_isnan(PAL_POSINF, PAL_POSINF, PAL_NEGINF); - validate_isnan(PAL_NEGINF, PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, PAL_NEGINF, PAL_POSINF); - validate_isnan(PAL_NEGINF, PAL_POSINF, PAL_POSINF); - - validate_isnan(PAL_POSINF, 1, PAL_NEGINF); - validate_isnan(PAL_NEGINF, 1, PAL_POSINF); - validate_isnan(1, PAL_POSINF, PAL_NEGINF); - validate_isnan(1, PAL_NEGINF, PAL_POSINF); + fma_test1_validate_isnan(PAL_POSINF, PAL_POSINF, PAL_NEGINF); + fma_test1_validate_isnan(PAL_NEGINF, PAL_NEGINF, PAL_NEGINF); + fma_test1_validate_isnan(PAL_POSINF, PAL_NEGINF, PAL_POSINF); + fma_test1_validate_isnan(PAL_NEGINF, PAL_POSINF, PAL_POSINF); + + fma_test1_validate_isnan(PAL_POSINF, 1, PAL_NEGINF); + fma_test1_validate_isnan(PAL_NEGINF, 1, PAL_POSINF); + fma_test1_validate_isnan(1, PAL_POSINF, PAL_NEGINF); + fma_test1_validate_isnan(1, PAL_NEGINF, PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/testinfo.dat deleted file mode 100644 index daa452056d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fma/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fma -Name = Call fma with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the fma function with various num/exponent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/CMakeLists.txt deleted file mode 100644 index 3d6be05aa53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_fmaf_test1 - ${SOURCES} -) - -add_dependencies(paltest_fmaf_test1 coreclrpal) - -target_link_libraries(paltest_fmaf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/test1.cpp index 34b63f6c0d2..10015a58511 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/test1.cpp @@ -43,11 +43,11 @@ struct test }; /** - * validate + * fmaf_test1_validate * * test validation function */ -void __cdecl validate(float x, float y, float z, float expected, float variance) +void __cdecl fmaf_test1_validate(float x, float y, float z, float expected, float variance) { float result = fmaf(x, y, z); @@ -65,11 +65,11 @@ void __cdecl validate(float x, float y, float z, float expected, float variance) } /** - * validate + * fmaf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float x, float y, float z) +void __cdecl fmaf_test1_validate_isnan(float x, float y, float z) { float result = fmaf(x, y, z); @@ -85,7 +85,7 @@ void __cdecl validate_isnan(float x, float y, float z) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fmaf_test1_paltest_fmaf_test1, "c_runtime/fmaf/test1/paltest_fmaf_test1") { struct test tests[] = { @@ -103,41 +103,41 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].x, tests[i].y, tests[i].z, tests[i].expected, tests[i].variance); + fmaf_test1_validate(tests[i].x, tests[i].y, tests[i].z, tests[i].expected, tests[i].variance); } // Returns NaN if x or y is infinite, the other is zero, and z is NaN - validate_isnan(PAL_NEGINF, 0, PAL_NAN); - validate_isnan(PAL_POSINF, 0, PAL_NAN); - validate_isnan(0, PAL_NEGINF, PAL_NAN); - validate_isnan(0, PAL_POSINF, PAL_NAN); + fmaf_test1_validate_isnan(PAL_NEGINF, 0, PAL_NAN); + fmaf_test1_validate_isnan(PAL_POSINF, 0, PAL_NAN); + fmaf_test1_validate_isnan(0, PAL_NEGINF, PAL_NAN); + fmaf_test1_validate_isnan(0, PAL_POSINF, PAL_NAN); // Returns NaN if x or y is infinite, the other is zero, and z is not-NaN - validate_isnan(PAL_POSINF, 0, PAL_NEGINF); - validate_isnan(PAL_NEGINF, 0, PAL_NEGINF); - validate_isnan(0, PAL_POSINF, PAL_NEGINF); - validate_isnan(0, PAL_NEGINF, PAL_NEGINF); + fmaf_test1_validate_isnan(PAL_POSINF, 0, PAL_NEGINF); + fmaf_test1_validate_isnan(PAL_NEGINF, 0, PAL_NEGINF); + fmaf_test1_validate_isnan(0, PAL_POSINF, PAL_NEGINF); + fmaf_test1_validate_isnan(0, PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, 0, 0); - validate_isnan(PAL_NEGINF, 0, 0); - validate_isnan(0, PAL_POSINF, 0); - validate_isnan(0, PAL_NEGINF, 0); + fmaf_test1_validate_isnan(PAL_POSINF, 0, 0); + fmaf_test1_validate_isnan(PAL_NEGINF, 0, 0); + fmaf_test1_validate_isnan(0, PAL_POSINF, 0); + fmaf_test1_validate_isnan(0, PAL_NEGINF, 0); - validate_isnan(PAL_POSINF, 0, PAL_POSINF); - validate_isnan(PAL_NEGINF, 0, PAL_POSINF); - validate_isnan(0, PAL_POSINF, PAL_POSINF); - validate_isnan(0, PAL_NEGINF, PAL_POSINF); + fmaf_test1_validate_isnan(PAL_POSINF, 0, PAL_POSINF); + fmaf_test1_validate_isnan(PAL_NEGINF, 0, PAL_POSINF); + fmaf_test1_validate_isnan(0, PAL_POSINF, PAL_POSINF); + fmaf_test1_validate_isnan(0, PAL_NEGINF, PAL_POSINF); // Returns NaN if (x * y) is infinite, and z is an infinite of the opposite sign - validate_isnan(PAL_POSINF, PAL_POSINF, PAL_NEGINF); - validate_isnan(PAL_NEGINF, PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, PAL_NEGINF, PAL_POSINF); - validate_isnan(PAL_NEGINF, PAL_POSINF, PAL_POSINF); - - validate_isnan(PAL_POSINF, 1, PAL_NEGINF); - validate_isnan(PAL_NEGINF, 1, PAL_POSINF); - validate_isnan(1, PAL_POSINF, PAL_NEGINF); - validate_isnan(1, PAL_NEGINF, PAL_POSINF); + fmaf_test1_validate_isnan(PAL_POSINF, PAL_POSINF, PAL_NEGINF); + fmaf_test1_validate_isnan(PAL_NEGINF, PAL_NEGINF, PAL_NEGINF); + fmaf_test1_validate_isnan(PAL_POSINF, PAL_NEGINF, PAL_POSINF); + fmaf_test1_validate_isnan(PAL_NEGINF, PAL_POSINF, PAL_POSINF); + + fmaf_test1_validate_isnan(PAL_POSINF, 1, PAL_NEGINF); + fmaf_test1_validate_isnan(PAL_NEGINF, 1, PAL_POSINF); + fmaf_test1_validate_isnan(1, PAL_POSINF, PAL_NEGINF); + fmaf_test1_validate_isnan(1, PAL_NEGINF, PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/testinfo.dat deleted file mode 100644 index d62caa5bc54..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmaf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fmaf -Name = Call fmaf with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the fmaf function with various num/expfonent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt deleted file mode 100644 index 099b0981b3d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fmod_test1 - ${SOURCES} -) - -add_dependencies(paltest_fmod_test1 coreclrpal) - -target_link_libraries(paltest_fmod_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp index cf4ec5891df..d02b09d0e0d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp @@ -46,11 +46,11 @@ struct test }; /** - * validate + * fmod_test1_validate * * test validation function */ -void __cdecl validate(double numerator, double denominator, double expected, double variance) +void __cdecl fmod_test1_validate(double numerator, double denominator, double expected, double variance) { double result = fmod(numerator, denominator); @@ -68,11 +68,11 @@ void __cdecl validate(double numerator, double denominator, double expected, dou } /** - * validate + * fmod_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double numerator, double denominator) +void __cdecl fmod_test1_validate_isnan(double numerator, double denominator) { double result = fmod(numerator, denominator); @@ -88,7 +88,7 @@ void __cdecl validate_isnan(double numerator, double denominator) * * executable entry point */ -INT __cdecl main(INT argc, CHAR **argv) +PALTEST(c_runtime_fmod_test1_paltest_fmod_test1, "c_runtime/fmod/test1/paltest_fmod_test1") { struct test tests[] = { @@ -120,36 +120,36 @@ INT __cdecl main(INT argc, CHAR **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].numerator, tests[i].denominator, tests[i].expected, tests[i].variance); - validate(-tests[i].numerator, tests[i].denominator, -tests[i].expected, tests[i].variance); - validate( tests[i].numerator, -tests[i].denominator, tests[i].expected, tests[i].variance); - validate(-tests[i].numerator, -tests[i].denominator, -tests[i].expected, tests[i].variance); + fmod_test1_validate( tests[i].numerator, tests[i].denominator, tests[i].expected, tests[i].variance); + fmod_test1_validate(-tests[i].numerator, tests[i].denominator, -tests[i].expected, tests[i].variance); + fmod_test1_validate( tests[i].numerator, -tests[i].denominator, tests[i].expected, tests[i].variance); + fmod_test1_validate(-tests[i].numerator, -tests[i].denominator, -tests[i].expected, tests[i].variance); } - validate_isnan( 0, 0); - validate_isnan(-0.0, 0); - validate_isnan( 0, -0.0); - validate_isnan(-0.0, -0.0); + fmod_test1_validate_isnan( 0, 0); + fmod_test1_validate_isnan(-0.0, 0); + fmod_test1_validate_isnan( 0, -0.0); + fmod_test1_validate_isnan(-0.0, -0.0); - validate_isnan( 1, 0); - validate_isnan(-1.0, 0); - validate_isnan( 1, -0.0); - validate_isnan(-1.0, -0.0); + fmod_test1_validate_isnan( 1, 0); + fmod_test1_validate_isnan(-1.0, 0); + fmod_test1_validate_isnan( 1, -0.0); + fmod_test1_validate_isnan(-1.0, -0.0); - validate_isnan(PAL_POSINF, PAL_POSINF); - validate_isnan(PAL_NEGINF, PAL_POSINF); - validate_isnan(PAL_POSINF, PAL_NEGINF); - validate_isnan(PAL_NEGINF, PAL_NEGINF); + fmod_test1_validate_isnan(PAL_POSINF, PAL_POSINF); + fmod_test1_validate_isnan(PAL_NEGINF, PAL_POSINF); + fmod_test1_validate_isnan(PAL_POSINF, PAL_NEGINF); + fmod_test1_validate_isnan(PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, 0); - validate_isnan(PAL_NEGINF, 0); - validate_isnan(PAL_POSINF, -0.0); - validate_isnan(PAL_NEGINF, -0.0); + fmod_test1_validate_isnan(PAL_POSINF, 0); + fmod_test1_validate_isnan(PAL_NEGINF, 0); + fmod_test1_validate_isnan(PAL_POSINF, -0.0); + fmod_test1_validate_isnan(PAL_NEGINF, -0.0); - validate_isnan(PAL_POSINF, 1); - validate_isnan(PAL_NEGINF, 1); - validate_isnan(PAL_POSINF, -1.0); - validate_isnan(PAL_NEGINF, -1.0); + fmod_test1_validate_isnan(PAL_POSINF, 1); + fmod_test1_validate_isnan(PAL_NEGINF, 1); + fmod_test1_validate_isnan(PAL_POSINF, -1.0); + fmod_test1_validate_isnan(PAL_NEGINF, -1.0); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/testinfo.dat deleted file mode 100644 index ff196cad90a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmod/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fmod -Name = Positive Test for fmod -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to fmod() a series of values, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt deleted file mode 100644 index ac125ab5275..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fmodf_test1 - ${SOURCES} -) - -add_dependencies(paltest_fmodf_test1 coreclrpal) - -target_link_libraries(paltest_fmodf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp index 9768db041b7..b73f7824f16 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * fmodf_test1_validate * * test validation function */ -void __cdecl validate(float numerator, float denominator, float expected, float variance) +void __cdecl fmodf_test1_validate(float numerator, float denominator, float expected, float variance) { float result = fmodf(numerator, denominator); @@ -67,11 +67,11 @@ void __cdecl validate(float numerator, float denominator, float expected, float } /** - * validate + * fmodf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float numerator, float denominator) +void __cdecl fmodf_test1_validate_isnan(float numerator, float denominator) { float result = fmodf(numerator, denominator); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(float numerator, float denominator) * * executable entry point */ -INT __cdecl main(INT argc, CHAR **argv) +PALTEST(c_runtime_fmodf_test1_paltest_fmodf_test1, "c_runtime/fmodf/test1/paltest_fmodf_test1") { struct test tests[] = { @@ -119,36 +119,36 @@ INT __cdecl main(INT argc, CHAR **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].numerator, tests[i].denominator, tests[i].expected, tests[i].variance); - validate(-tests[i].numerator, tests[i].denominator, -tests[i].expected, tests[i].variance); - validate( tests[i].numerator, -tests[i].denominator, tests[i].expected, tests[i].variance); - validate(-tests[i].numerator, -tests[i].denominator, -tests[i].expected, tests[i].variance); + fmodf_test1_validate( tests[i].numerator, tests[i].denominator, tests[i].expected, tests[i].variance); + fmodf_test1_validate(-tests[i].numerator, tests[i].denominator, -tests[i].expected, tests[i].variance); + fmodf_test1_validate( tests[i].numerator, -tests[i].denominator, tests[i].expected, tests[i].variance); + fmodf_test1_validate(-tests[i].numerator, -tests[i].denominator, -tests[i].expected, tests[i].variance); } - validate_isnan( 0, 0); - validate_isnan(-0.0f, 0); - validate_isnan( 0, -0.0f); - validate_isnan(-0.0f, -0.0f); + fmodf_test1_validate_isnan( 0, 0); + fmodf_test1_validate_isnan(-0.0f, 0); + fmodf_test1_validate_isnan( 0, -0.0f); + fmodf_test1_validate_isnan(-0.0f, -0.0f); - validate_isnan( 1, 0); - validate_isnan(-1, 0); - validate_isnan( 1, -0.0f); - validate_isnan(-1, -0.0f); + fmodf_test1_validate_isnan( 1, 0); + fmodf_test1_validate_isnan(-1, 0); + fmodf_test1_validate_isnan( 1, -0.0f); + fmodf_test1_validate_isnan(-1, -0.0f); - validate_isnan(PAL_POSINF, PAL_POSINF); - validate_isnan(PAL_NEGINF, PAL_POSINF); - validate_isnan(PAL_POSINF, PAL_NEGINF); - validate_isnan(PAL_NEGINF, PAL_NEGINF); + fmodf_test1_validate_isnan(PAL_POSINF, PAL_POSINF); + fmodf_test1_validate_isnan(PAL_NEGINF, PAL_POSINF); + fmodf_test1_validate_isnan(PAL_POSINF, PAL_NEGINF); + fmodf_test1_validate_isnan(PAL_NEGINF, PAL_NEGINF); - validate_isnan(PAL_POSINF, 0); - validate_isnan(PAL_NEGINF, 0); - validate_isnan(PAL_POSINF, -0.0f); - validate_isnan(PAL_NEGINF, -0.0f); + fmodf_test1_validate_isnan(PAL_POSINF, 0); + fmodf_test1_validate_isnan(PAL_NEGINF, 0); + fmodf_test1_validate_isnan(PAL_POSINF, -0.0f); + fmodf_test1_validate_isnan(PAL_NEGINF, -0.0f); - validate_isnan(PAL_POSINF, 1); - validate_isnan(PAL_NEGINF, 1); - validate_isnan(PAL_POSINF, -1); - validate_isnan(PAL_NEGINF, -1); + fmodf_test1_validate_isnan(PAL_POSINF, 1); + fmodf_test1_validate_isnan(PAL_NEGINF, 1); + fmodf_test1_validate_isnan(PAL_POSINF, -1); + fmodf_test1_validate_isnan(PAL_NEGINF, -1); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/testinfo.dat deleted file mode 100644 index 6c9ac05fe63..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fmodf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fmodf -Name = Positive Test for fmodf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to fmodf() a series of values, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/CMakeLists.txt deleted file mode 100644 index 7cd88f8e86d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt deleted file mode 100644 index b0bae9fcb26..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fopen_test1 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test1 coreclrpal) - -target_link_libraries(paltest_fopen_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp index 42009e8acf0..abbc328d594 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp @@ -24,7 +24,7 @@ struct testCase char mode[20]; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test1_paltest_fopen_test1, "c_runtime/fopen/test1/paltest_fopen_test1") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/testinfo.dat deleted file mode 100644 index efff7c8005c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test1 -Description -= This test simply attempts to open a number of files with different -= modes. It checks to ensure a valid file pointer is returned. It -= doesn't do any checking to ensure the mode is really what it claims. -= Checks for returned value when attempts to open a directory. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt deleted file mode 100644 index a3efc886351..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fopen_test2 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test2 coreclrpal) - -target_link_libraries(paltest_fopen_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp index 8c66c66fcd6..b588c41fd23 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test2_paltest_fopen_test2, "c_runtime/fopen/test2/paltest_fopen_test2") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/testinfo.dat deleted file mode 100644 index 0201327fb16..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure that you can write to a 'w' mode file. And that you can't -= read from a 'w' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt deleted file mode 100644 index c6686ac4cce..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_fopen_test3 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test3 coreclrpal) - -target_link_libraries(paltest_fopen_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp index fd1a7976d61..3be80f16109 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test3_paltest_fopen_test3, "c_runtime/fopen/test3/paltest_fopen_test3") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/testinfo.dat deleted file mode 100644 index 3b9864641b3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test3 -Description -= Test to ensure that you can write to a 'w+' mode file. And that you can -= read from a 'w+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt deleted file mode 100644 index ab92939643c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_fopen_test4 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test4 coreclrpal) - -target_link_libraries(paltest_fopen_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp index 83c6987397d..24f8bfa11e7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test4_paltest_fopen_test4, "c_runtime/fopen/test4/paltest_fopen_test4") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/testinfo.dat deleted file mode 100644 index ba3a6c59518..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure that you can't write to a 'r' mode file. And that you can -= read from a 'r' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt deleted file mode 100644 index ccbce5d6ba4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_fopen_test5 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test5 coreclrpal) - -target_link_libraries(paltest_fopen_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp index 81428a4dcfc..04205aca833 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test5_paltest_fopen_test5, "c_runtime/fopen/test5/paltest_fopen_test5") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/testinfo.dat deleted file mode 100644 index 5528ec39b50..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test5 -Description -= Test to ensure that you can write to a 'r+' mode file. And that you can -= read from a 'r+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt deleted file mode 100644 index 7e373e71fa9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_fopen_test6 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test6 coreclrpal) - -target_link_libraries(paltest_fopen_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp index 7e55b0963c4..13f00cc9300 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test6_paltest_fopen_test6, "c_runtime/fopen/test6/paltest_fopen_test6") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/testinfo.dat deleted file mode 100644 index c28ce15b975..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test6 -Description -= Test to ensure that you can write to a 'a' mode file. And that you can't -= read from a 'a' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt deleted file mode 100644 index 8c8d1c2c37d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_fopen_test7 - ${SOURCES} -) - -add_dependencies(paltest_fopen_test7 coreclrpal) - -target_link_libraries(paltest_fopen_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp index 719ed7d0825..0cf274d8c6b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fopen_test7_paltest_fopen_test7, "c_runtime/fopen/test7/paltest_fopen_test7") { FILE *fp; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/testinfo.dat deleted file mode 100644 index 642695288ed..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fopen/test7/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fopen -Name = Positive Test for fopen -TYPE = DEFAULT -EXE1 = test7 -Description -= Test to ensure that you can write to a 'a+' mode file. And that you can -= read from a 'a+' mode file. - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/CMakeLists.txt deleted file mode 100644 index 256753a6364..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h index beead0eee58..fe19a4d7458 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h @@ -10,7 +10,7 @@ function with this as a return type. #ifndef __FPRINTF_H__ #define __FPRINTF_H__ -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_fprintf(const char *formatstr, char* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -32,8 +32,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) } fclose(fp); } +#define DoStrTest DoStrTest_fprintf -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_fprintf(const char *formatstr, WCHAR* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -55,9 +56,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) } fclose(fp); } +#define DoWStrTest DoWStrTest_fprintf - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_fprintf(const char *formatstr, char param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -79,8 +80,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) } fclose(fp); } +#define DoCharTest DoCharTest_fprintf -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_fprintf(const char *formatstr, WCHAR param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -102,8 +104,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) } fclose(fp); } +#define DoWCharTest DoWCharTest_fprintf -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_fprintf(const char *formatstr, int value, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -125,8 +128,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) } fclose(fp); } +#define DoNumTest DoNumTest_fprintf -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1, const char *checkstr2) +inline void DoI64Test_fprintf(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1, const char *checkstr2) { FILE *fp; char buf[256] = { 0 }; @@ -149,8 +153,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c } fclose(fp); } +#define DoI64Test DoI64Test_fprintf -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, const char *checkstr2) +inline void DoDoubleTest_fprintf(const char *formatstr, double value, const char *checkstr1, const char *checkstr2) { FILE *fp; char buf[256] = { 0 }; @@ -173,4 +178,5 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, co } fclose(fp); } +#define DoDoubleTest DoDoubleTest_fprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt deleted file mode 100644 index c092aaf9eee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test1 coreclrpal) - -target_link_libraries(paltest_fprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp index b97ed0e1b92..8fa9ef72fc7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fgets, fseek and fclose. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test1_paltest_fprintf_test1, "c_runtime/fprintf/test1/paltest_fprintf_test1") { FILE *fp; char testfile[] = "testfile.txt"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/testinfo.dat deleted file mode 100644 index e5049fea050..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= A single, basic, test case with no formatting. -= Test modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt deleted file mode 100644 index c095555ed6f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_fprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test10 coreclrpal) - -target_link_libraries(paltest_fprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp index b7061b62ac0..b94ee2e7a7e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test10_paltest_fprintf_test10, "c_runtime/fprintf/test10/paltest_fprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/testinfo.dat deleted file mode 100644 index f7704dd5673..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test10/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the octal specifier (%o). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt deleted file mode 100644 index 32559bf8003..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_fprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test11 coreclrpal) - -target_link_libraries(paltest_fprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp index 4451ccdb5ac..4b987fcb266 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test11_paltest_fprintf_test11, "c_runtime/fprintf/test11/paltest_fprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/testinfo.dat deleted file mode 100644 index 8a7084e1b04..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test11/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Test the unsigned int specifier (%u). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt deleted file mode 100644 index 1ee3cb295d2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_fprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test12 coreclrpal) - -target_link_libraries(paltest_fprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp index db65b1c4458..368de6987a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test12_paltest_fprintf_test12, "c_runtime/fprintf/test12/paltest_fprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/testinfo.dat deleted file mode 100644 index 80f855c0587..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test12/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the (lowercase) hexadecimal specifier (%x). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt deleted file mode 100644 index 1c4049e992d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_fprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test13 coreclrpal) - -target_link_libraries(paltest_fprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp index 7a29345aa77..52cca2d9e79 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test13_paltest_fprintf_test13, "c_runtime/fprintf/test13/paltest_fprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/testinfo.dat deleted file mode 100644 index 49c0c469fda..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test13/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the (uppercase) hexadecimal specifier (%X). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt deleted file mode 100644 index 3266d846d1b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_fprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test14 coreclrpal) - -target_link_libraries(paltest_fprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp index 1396181e467..2d230acbc32 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp @@ -19,7 +19,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test14_paltest_fprintf_test14, "c_runtime/fprintf/test14/paltest_fprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/testinfo.dat deleted file mode 100644 index 0628542f3e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the lowercase exponential -= notation double specifier (%e). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt deleted file mode 100644 index 51e74449395..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_fprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test15 coreclrpal) - -target_link_libraries(paltest_fprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp index 0a1d25880d1..c5b15723c5e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp @@ -19,7 +19,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test15_paltest_fprintf_test15, "c_runtime/fprintf/test15/paltest_fprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/testinfo.dat deleted file mode 100644 index af6d4f56bd4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the uppercase exponential -= notation double specifier (%E). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt deleted file mode 100644 index 388ff218ef3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_fprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test16 coreclrpal) - -target_link_libraries(paltest_fprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp index e68876a12f5..fd56b5b54fe 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test16_paltest_fprintf_test16, "c_runtime/fprintf/test16/paltest_fprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/testinfo.dat deleted file mode 100644 index 1bbed723c36..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test16/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the decimal notation double specifier (%f). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt deleted file mode 100644 index b2f46f51057..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_fprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test17 coreclrpal) - -target_link_libraries(paltest_fprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp index a2b366c184c..e12048d25ce 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test17_paltest_fprintf_test17, "c_runtime/fprintf/test17/paltest_fprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/testinfo.dat deleted file mode 100644 index 014c9c60d00..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test17/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the lowercase shorthand notation double specifier (%g). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt deleted file mode 100644 index 65a2329b235..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_fprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test18 coreclrpal) - -target_link_libraries(paltest_fprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp index 6c28d6d8d3f..62e4b6622f2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test18_paltest_fprintf_test18, "c_runtime/fprintf/test18/paltest_fprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/testinfo.dat deleted file mode 100644 index a1bd6109c49..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test18/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the uppercase shorthand notation double specifier (%G). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt deleted file mode 100644 index 934285871ef..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_fprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test19 coreclrpal) - -target_link_libraries(paltest_fprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp index 7e82b98311d..26a92db5142 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp @@ -104,7 +104,7 @@ void DoublePrecTest(char *formatstr, int precision, } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test19_paltest_fprintf_test19, "c_runtime/fprintf/test19/paltest_fprintf_test19") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/testinfo.dat deleted file mode 100644 index d30e57dfa2e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test19/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the variable length precision argument. -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt deleted file mode 100644 index daa9a5fd991..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test2 coreclrpal) - -target_link_libraries(paltest_fprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp index 79c638027de..8d08177463a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test2_paltest_fprintf_test2, "c_runtime/fprintf/test2/paltest_fprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/testinfo.dat deleted file mode 100644 index eac39643ac9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the string specifier (%s). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt deleted file mode 100644 index 7b3ed7b3096..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_fprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test3 coreclrpal) - -target_link_libraries(paltest_fprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp index 8819aa36c35..6f15affb4d9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test3_paltest_fprintf_test3, "c_runtime/fprintf/test3/paltest_fprintf_test3") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/testinfo.dat deleted file mode 100644 index 9fa452afa34..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the wide string specifier (%S). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt deleted file mode 100644 index 10a3c948b69..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_fprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test4 coreclrpal) - -target_link_libraries(paltest_fprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp index 00450ba852f..2717de09db4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp @@ -62,7 +62,7 @@ static void DoTest(char *formatstr, void* param, char* paramstr, } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test4_paltest_fprintf_test4, "c_runtime/fprintf/test4/paltest_fprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/testinfo.dat deleted file mode 100644 index cbea3031975..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the pointer specifier (%p). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt deleted file mode 100644 index 87536616d0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_fprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test5 coreclrpal) - -target_link_libraries(paltest_fprintf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp index 8318b1a83ef..1834f248db1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp @@ -108,7 +108,7 @@ static void DoShortTest(char *formatstr, int param, char *checkstr) } } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test5_paltest_fprintf_test5, "c_runtime/fprintf/test5/paltest_fprintf_test5") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/testinfo.dat deleted file mode 100644 index ac3e1e9dafd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the count specifier (%n). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt deleted file mode 100644 index 8c7253cd782..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_fprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test6 coreclrpal) - -target_link_libraries(paltest_fprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp index 0de4fedc065..5cf185cd5c8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test6_paltest_fprintf_test6, "c_runtime/fprintf/test6/paltest_fprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/testinfo.dat deleted file mode 100644 index cbad94d74a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test6/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the char specifier (%c). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt deleted file mode 100644 index 7e803e709d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_fprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test7 coreclrpal) - -target_link_libraries(paltest_fprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp index 12bb0e595d4..d81916c8a28 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test7_paltest_fprintf_test7, "c_runtime/fprintf/test7/paltest_fprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/testinfo.dat deleted file mode 100644 index aef742a3dcb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test7/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the wide char specifier (%C). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt deleted file mode 100644 index 0dd9501e474..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_fprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test8 coreclrpal) - -target_link_libraries(paltest_fprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp index a59cee3caa3..3392affaef7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test8_paltest_fprintf_test8, "c_runtime/fprintf/test8/paltest_fprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/testinfo.dat deleted file mode 100644 index e18af7dd2ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test8/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the decimal specifier (%d). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt deleted file mode 100644 index 60ad7492792..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_fprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_fprintf_test9 coreclrpal) - -target_link_libraries(paltest_fprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp index 978a06177d2..7e42d5daf69 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fprintf_test9_paltest_fprintf_test9, "c_runtime/fprintf/test9/paltest_fprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/testinfo.dat deleted file mode 100644 index 6a8ae9653a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fprintf/test9/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fprintf -Name = Positive Test for fprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the integer specifier (%i). -= This test is modeled after the fprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt deleted file mode 100644 index 1a9ccfa1235..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fputs_test1 - ${SOURCES} -) - -add_dependencies(paltest_fputs_test1 coreclrpal) - -target_link_libraries(paltest_fputs_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp index e4e0443faa6..c746daff9e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fputs_test1_paltest_fputs_test1, "c_runtime/fputs/test1/paltest_fputs_test1") { FILE* TheFile; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/testinfo.dat deleted file mode 100644 index 199eb4684af..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fputs -Name = Check that fputs writes correctly to a valid stream -TYPE = DEFAULT -EXE1 = test1 -Description -= Call fputs twice and write two strings to a file. Then -= call fread on the file and check that the data which was written is what -= we expect it to be. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt deleted file mode 100644 index 261b420e015..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fputs_test2 - ${SOURCES} -) - -add_dependencies(paltest_fputs_test2 coreclrpal) - -target_link_libraries(paltest_fputs_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp index 3b1c8baf4bc..aa8d36a5115 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fputs_test2_paltest_fputs_test2, "c_runtime/fputs/test2/paltest_fputs_test2") { FILE* TheFile; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/testinfo.dat deleted file mode 100644 index 923eaf11afd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fputs/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fputs -Name = Check that fputs returns EOF when called on closed/readonly streams -TYPE = DEFAULT -EXE1 = test2 -Description -= Check to see that fputs fails and returns EOF when called on -= a closed file stream and a read-only file stream. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt deleted file mode 100644 index a4e54c42fea..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fread_test1 - ${SOURCES} -) - -add_dependencies(paltest_fread_test1 coreclrpal) - -target_link_libraries(paltest_fread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp index 95d60d544eb..3cfe9fa444a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp @@ -29,7 +29,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fread_test1_paltest_fread_test1, "c_runtime/fread/test1/paltest_fread_test1") { const char filename[] = "testfile"; char buffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/testinfo.dat deleted file mode 100644 index 79351d10fc3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fread -Name = Positive Test for fread -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the fread function. -= Open a file in READ mode, and then try to read all the characters, -= more than all the characters, 0 characters and 0 sized characters and -= check that the return values are correct. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt deleted file mode 100644 index 01fd7c77765..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fread_test2 - ${SOURCES} -) - -add_dependencies(paltest_fread_test2 coreclrpal) - -target_link_libraries(paltest_fread_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp index 53f5f6b1cbf..de372204eb6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp @@ -31,7 +31,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fread_test2_paltest_fread_test2, "c_runtime/fread/test2/paltest_fread_test2") { const char filename[] = "testfile"; char buffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/testinfo.dat deleted file mode 100644 index 06205cef669..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test2/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fread -Name = Positive Test for fread -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the fread function. -= Open a file in READ mode, and then try to read all -= the characters, more than all the characters, -= 0 characters and 0 sized characters and check that -= the strings read in are correct. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt deleted file mode 100644 index 07615a3d285..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_fread_test3 - ${SOURCES} -) - -add_dependencies(paltest_fread_test3 coreclrpal) - -target_link_libraries(paltest_fread_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp index c4998ab8230..75ae9c6ad1b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp @@ -25,7 +25,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fread_test3_paltest_fread_test3, "c_runtime/fread/test3/paltest_fread_test3") { const char filename[] = "testfile"; char buffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/testinfo.dat deleted file mode 100644 index 9662aeb5b6e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fread/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fread -Name = Positive Test for fread -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the fread function. -= Open a file in READ mode, then try to read from the file with -= different 'size' params. Check to ensure the return values and -= the text in the buffer is correct diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/free/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt deleted file mode 100644 index c8c5aa9be9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_free_test1 - ${SOURCES} -) - -add_dependencies(paltest_free_test1 coreclrpal) - -target_link_libraries(paltest_free_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp index ca49da436fd..dc8d1315886 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_free_test1_paltest_free_test1, "c_runtime/free/test1/paltest_free_test1") { char *testA; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/testinfo.dat deleted file mode 100644 index a220635ee5c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/free/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = free -Name = Positive Test for free -TYPE = DEFAULT -EXE1 = test1 -Description -= Repeatedly allocates and frees a chunk of memory, to verify that free -= is really returning memory to the heap - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt deleted file mode 100644 index b175d42a660..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fseek_test1 - ${SOURCES} -) - -add_dependencies(paltest_fseek_test1 coreclrpal) - -target_link_libraries(paltest_fseek_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp index 2fd1144571a..7fdfc2fef2f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp @@ -39,7 +39,7 @@ static BOOL Cleanup(HANDLE hFile) return result; } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fseek_test1_paltest_fseek_test1, "c_runtime/fseek/test1/paltest_fseek_test1") { char outBuf[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; char inBuf[20]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/testinfo.dat deleted file mode 100644 index 32e862db75e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fseek/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fseek -Name = Positive Test for fseek -TYPE = DEFAULT -EXE1 = test1 -Description -= Call seek to move a file pointer to the start of a file, a position -= offset from the start, a position offset from the current position, and -= a position offset from the end of the file. Check that the file -= pointer is at the correct position after each seek. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt deleted file mode 100644 index 4167741726b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ftell.cpp -) - -add_executable(paltest_ftell_test1 - ${SOURCES} -) - -add_dependencies(paltest_ftell_test1 coreclrpal) - -target_link_libraries(paltest_ftell_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp index b5900887e5d..1c60fab2079 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp @@ -82,7 +82,7 @@ BOOL MovePointer(long lDist, int nFrom) -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_ftell_test1_paltest_ftell_test1, "c_runtime/ftell/test1/paltest_ftell_test1") { const char szFileName[] = {"testfile.txt"}; long lPos = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/testinfo.dat deleted file mode 100644 index e4f2333213c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ftell/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = c_runtime -Function = ftell -Name = test for ftell (test 1) -Type = DEFAULT -EXE1 = ftell -Description -= Use fseek and a static list of distances to move, direction -= to move and expected results to test the ftell function. A typical -= test will move the file pointer with fseek then call ftell. The -= results from ftell will then be compared to the expected result to -= determine whether the test passed or failed. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/CMakeLists.txt deleted file mode 100644 index 256753a6364..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h index f6bfc10918b..25376de5e9f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h @@ -13,7 +13,7 @@ #ifndef __fwprintf_H__ #define __fwprintf_H__ -void DoStrTest(const WCHAR *formatstr, char* param, const char *checkstr) +inline void DoStrTest_fwprintf(const WCHAR *formatstr, char* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -43,8 +43,9 @@ void DoStrTest(const WCHAR *formatstr, char* param, const char *checkstr) } fclose(fp); } +#define DoStrTest DoStrTest_fwprintf -void DoWStrTest(const WCHAR *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_fwprintf(const WCHAR *formatstr, WCHAR* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -74,9 +75,9 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR* param, const char *checkstr) } fclose(fp); } +#define DoWStrTest DoWStrTest_fwprintf - -void DoPointerTest(const WCHAR *formatstr, void* param, char* paramstr, +inline void DoPointerTest_fwprintf(const WCHAR *formatstr, void* param, char* paramstr, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -115,10 +116,10 @@ void DoPointerTest(const WCHAR *formatstr, void* param, char* paramstr, Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoPointerTest DoPointerTest_fwprintf - -void DoCountTest(const WCHAR *formatstr, int param, const char *checkstr) +inline void DoCountTest_fwprintf(const WCHAR *formatstr, int param, const char *checkstr) { FILE *fp; char buf[512] = { 0 }; @@ -160,8 +161,9 @@ void DoCountTest(const WCHAR *formatstr, int param, const char *checkstr) Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoCountTest DoCountTest_fwprintf -void DoShortCountTest(const WCHAR *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_fwprintf(const WCHAR *formatstr, int param, const char *checkstr) { FILE *fp; char buf[512] = { 0 }; @@ -203,9 +205,9 @@ void DoShortCountTest(const WCHAR *formatstr, int param, const char *checkstr) Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoShortCountTest DoShortCountTest_fwprintf - -void DoCharTest(const WCHAR *formatstr, char param, const char *checkstr) +inline void DoCharTest_fwprintf(const WCHAR *formatstr, char param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -235,8 +237,9 @@ void DoCharTest(const WCHAR *formatstr, char param, const char *checkstr) } fclose(fp); } +#define DoCharTest DoCharTest_fwprintf -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_fwprintf(const WCHAR *formatstr, WCHAR param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -266,8 +269,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const char *checkstr) } fclose(fp); } +#define DoWCharTest DoWCharTest_fwprintf -void DoNumTest(const WCHAR *formatstr, int value, const char *checkstr) +inline void DoNumTest_fwprintf(const WCHAR *formatstr, int value, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -297,8 +301,9 @@ void DoNumTest(const WCHAR *formatstr, int value, const char *checkstr) } fclose(fp); } +#define DoNumTest DoNumTest_fwprintf -void DoI64Test(const WCHAR *formatstr, INT64 value, char *valuestr, const char *checkstr1, +inline void DoI64Test_fwprintf(const WCHAR *formatstr, INT64 value, char *valuestr, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -330,8 +335,9 @@ void DoI64Test(const WCHAR *formatstr, INT64 value, char *valuestr, const char * } fclose(fp); } +#define DoI64Test DoI64Test_fwprintf -void DoDoubleTest(const WCHAR *formatstr, double value, const char *checkstr1, +inline void DoDoubleTest_fwprintf(const WCHAR *formatstr, double value, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -364,9 +370,9 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const char *checkstr1, } fclose(fp); } +#define DoDoubleTest DoDoubleTest_fwprintf - -void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_fwprintf(const WCHAR *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -407,8 +413,9 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, } } +#define DoArgumentPrecTest DoArgumentPrecTest_fwprintf -void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_fwprintf(const WCHAR *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -448,5 +455,5 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para } } - +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_fwprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt deleted file mode 100644 index b337d8a40c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fwprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test1 coreclrpal) - -target_link_libraries(paltest_fwprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp index 784ddbfcab4..907c009b117 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fgets, fseek and fclose. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test1_paltest_fwprintf_test1, "c_runtime/fwprintf/test1/paltest_fwprintf_test1") { FILE *fp; char testfile[] = "testfile.txt"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/testinfo.dat deleted file mode 100644 index 0e86460b2c0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= A single, basic, test case with no formatting. -= Test modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt deleted file mode 100644 index a17b9641fbb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_fwprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test10 coreclrpal) - -target_link_libraries(paltest_fwprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp index 1e1574df0d9..eb3c3021702 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test10_paltest_fwprintf_test10, "c_runtime/fwprintf/test10/paltest_fwprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/testinfo.dat deleted file mode 100644 index 43032b16964..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test10/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the octal specifier (%o). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt deleted file mode 100644 index 9ba381ff663..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_fwprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test11 coreclrpal) - -target_link_libraries(paltest_fwprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp index ba01c9e5274..43d3c893176 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test11_paltest_fwprintf_test11, "c_runtime/fwprintf/test11/paltest_fwprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/testinfo.dat deleted file mode 100644 index e8a4ac89188..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test11/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Test the unsigned int specifier (%u). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt deleted file mode 100644 index da0f985e273..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_fwprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test12 coreclrpal) - -target_link_libraries(paltest_fwprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp index 86ae29c159d..eda46590a18 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test12_paltest_fwprintf_test12, "c_runtime/fwprintf/test12/paltest_fwprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/testinfo.dat deleted file mode 100644 index b33156ad2ec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test12/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the (lowercase) hexadecimal specifier (%x). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt deleted file mode 100644 index 08c287adf0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_fwprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test13 coreclrpal) - -target_link_libraries(paltest_fwprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp index ee8a0d7fb2a..0a9d214181b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test13_paltest_fwprintf_test13, "c_runtime/fwprintf/test13/paltest_fwprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/testinfo.dat deleted file mode 100644 index b8e7eaca0c3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test13/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the (uppercase) hexadecimal specifier (%X). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt deleted file mode 100644 index dacbfead240..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_fwprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test14 coreclrpal) - -target_link_libraries(paltest_fwprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp index 397f7a1e2b6..ea1436239d7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp @@ -19,7 +19,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test14_paltest_fwprintf_test14, "c_runtime/fwprintf/test14/paltest_fwprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/testinfo.dat deleted file mode 100644 index fc9947b4cee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the lowercase exponential -= notation double specifier (%e). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt deleted file mode 100644 index 4d42e736588..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_fwprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test15 coreclrpal) - -target_link_libraries(paltest_fwprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp index 672eb51402c..34f78cc3dba 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp @@ -19,7 +19,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test15_paltest_fwprintf_test15, "c_runtime/fwprintf/test15/paltest_fwprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/testinfo.dat deleted file mode 100644 index d9370d186b7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the uppercase exponential -= notation double specifier (%E). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt deleted file mode 100644 index 2b47be54904..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_fwprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test16 coreclrpal) - -target_link_libraries(paltest_fwprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp index 1aa29b82c05..8f90e162874 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test16_paltest_fwprintf_test16, "c_runtime/fwprintf/test16/paltest_fwprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/testinfo.dat deleted file mode 100644 index 7b9b7cf5775..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test16/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the decimal notation double specifier (%f). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt deleted file mode 100644 index 89e557b7766..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_fwprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test17 coreclrpal) - -target_link_libraries(paltest_fwprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp index 67d3156a6df..002bbcd034a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test17_paltest_fwprintf_test17, "c_runtime/fwprintf/test17/paltest_fwprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/testinfo.dat deleted file mode 100644 index 6d12af33a77..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test17/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the lowercase shorthand notation double specifier (%g). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt deleted file mode 100644 index 8e677c9c455..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_fwprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test18 coreclrpal) - -target_link_libraries(paltest_fwprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp index 001acd1eb60..fd9955b218d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test18_paltest_fwprintf_test18, "c_runtime/fwprintf/test18/paltest_fwprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/testinfo.dat deleted file mode 100644 index 839f5edcae3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test18/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the uppercase shorthand notation double specifier (%G). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt deleted file mode 100644 index 0d0c420c262..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_fwprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test19 coreclrpal) - -target_link_libraries(paltest_fwprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp index 1c4ac012284..c53509d2275 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp @@ -20,7 +20,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test19_paltest_fwprintf_test19, "c_runtime/fwprintf/test19/paltest_fwprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/testinfo.dat deleted file mode 100644 index 4161de7f43a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test19/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the variable length precision argument. -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt deleted file mode 100644 index 308d58e38b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_fwprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test2 coreclrpal) - -target_link_libraries(paltest_fwprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp index 79e1c382504..e591a71ab58 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test2_paltest_fwprintf_test2, "c_runtime/fwprintf/test2/paltest_fwprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/testinfo.dat deleted file mode 100644 index 22e41fd9e3e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the string specifier (%s). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt deleted file mode 100644 index ac5531efdea..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_fwprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test3 coreclrpal) - -target_link_libraries(paltest_fwprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp index 425526ad8ce..21876d28b1a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test3_paltest_fwprintf_test3, "c_runtime/fwprintf/test3/paltest_fwprintf_test3") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/testinfo.dat deleted file mode 100644 index 12d078a5c70..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the wide string specifier (%S). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt deleted file mode 100644 index 61b49dfd1e1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_fwprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test4 coreclrpal) - -target_link_libraries(paltest_fwprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp index 389e3ed81ad..35053ad0df3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test4_paltest_fwprintf_test4, "c_runtime/fwprintf/test4/paltest_fwprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/testinfo.dat deleted file mode 100644 index 75caf169182..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the pointer specifier (%p). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt deleted file mode 100644 index d136abd1459..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_fwprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test5 coreclrpal) - -target_link_libraries(paltest_fwprintf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp index 635c0128eec..d7ee738f8a1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test5_paltest_fwprintf_test5, "c_runtime/fwprintf/test5/paltest_fwprintf_test5") { WCHAR *longStr; char *longResult = diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/testinfo.dat deleted file mode 100644 index 1136506c4f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the count specifier (%n). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt deleted file mode 100644 index 128ec07fb44..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_fwprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test6 coreclrpal) - -target_link_libraries(paltest_fwprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp index b8cf52e8bfd..5baa96b229f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test6_paltest_fwprintf_test6, "c_runtime/fwprintf/test6/paltest_fwprintf_test6") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/testinfo.dat deleted file mode 100644 index 30b4cae7da9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test6/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the char specifier (%c). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt deleted file mode 100644 index 85d45bf01c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_fwprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test7 coreclrpal) - -target_link_libraries(paltest_fwprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp index 87beeb630d2..aff34340f63 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test7_paltest_fwprintf_test7, "c_runtime/fwprintf/test7/paltest_fwprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/testinfo.dat deleted file mode 100644 index 23ae9df7985..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test7/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the wide char specifier (%C). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt deleted file mode 100644 index 3d0ecc29423..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_fwprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test8 coreclrpal) - -target_link_libraries(paltest_fwprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp index 242e0ca9a8b..a7d253166e4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test8_paltest_fwprintf_test8, "c_runtime/fwprintf/test8/paltest_fwprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/testinfo.dat deleted file mode 100644 index e5bc8f086ea..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test8/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the decimal specifier (%d). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt deleted file mode 100644 index 502acf38d1e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_fwprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_fwprintf_test9 coreclrpal) - -target_link_libraries(paltest_fwprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp index 3c252af9963..74fbdfc57e8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp @@ -18,7 +18,7 @@ * Depends on memcmp, strlen, fopen, fseek and fgets. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_fwprintf_test9_paltest_fwprintf_test9, "c_runtime/fwprintf/test9/paltest_fwprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/testinfo.dat deleted file mode 100644 index 266f1176ace..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwprintf/test9/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwprintf -Name = Positive Test for fwprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the integer specifier (%i). -= This test is modeled after the sprintf series. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt deleted file mode 100644 index 7ed1e9a496a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_fwrite_test1 - ${SOURCES} -) - -add_dependencies(paltest_fwrite_test1 coreclrpal) - -target_link_libraries(paltest_fwrite_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp index 70e7deb245e..5b74faa8eac 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_fwrite_test1_paltest_fwrite_test1, "c_runtime/fwrite/test1/paltest_fwrite_test1") { const char filename[] = "testfile.tmp"; const char outBuffer[] = "This is a test."; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/testinfo.dat deleted file mode 100644 index c14a988fd4a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/fwrite/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = fwrite -Name = Positive Test for fwrite -TYPE = DEFAULT -EXE1 = test1 -Description -= Write a short string to a file and check that it was written properly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt deleted file mode 100644 index 70ae0e18ab9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_getenv_test1 - ${SOURCES} -) - -add_dependencies(paltest_getenv_test1 coreclrpal) - -target_link_libraries(paltest_getenv_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp index d7361d7de17..88f66e9d3cf 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_getenv_test1_paltest_getenv_test1, "c_runtime/getenv/test1/paltest_getenv_test1") { const char* SetVariable = "PalTestingEnvironmentVariable=The value"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/testinfo.dat deleted file mode 100644 index 9d0485bd8b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = getenv -Name = Test retrieval of variables correctly, and failure if they don't exist -TYPE = DEFAULT -EXE1 = test1 -Description -= Create an environment variable and then use getenv to get -= a pointer to it. Check that the pointer is valid and that the string -= is what we expected. Also check that searching for a non-existent -= variable will cause getenv to return NULL. Also check that changing -= the case (upper or lower) of a variable does not effect functionality. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt deleted file mode 100644 index a5ebccd658b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getenv_test2 - ${SOURCES} -) - -add_dependencies(paltest_getenv_test2 coreclrpal) - -target_link_libraries(paltest_getenv_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp index c0d2d27733f..250d7191603 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_getenv_test2_paltest_getenv_test2, "c_runtime/getenv/test2/paltest_getenv_test2") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/testinfo.dat deleted file mode 100644 index 1151f19590a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = getenv -Name = Test retrieval of variables differing only by case. -TYPE = DEFAULT -EXE1 = test2 -Description -= Check that environment variables differing only by their -= case are interpreted as separate variables by the BSD Operationg -= System. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt deleted file mode 100644 index a0e620dc276..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_getenv_test3 - ${SOURCES} -) - -add_dependencies(paltest_getenv_test3 coreclrpal) - -target_link_libraries(paltest_getenv_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp index ca734748b0b..e4c98c66adf 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_getenv_test3_paltest_getenv_test3, "c_runtime/getenv/test3/paltest_getenv_test3") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/testinfo.dat deleted file mode 100644 index ccec02c70cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/getenv/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = getenv -Name = Test retrieval of variables differing only by case. -TYPE = DEFAULT -EXE1 = test3 -Description -= Check that environment variables differing only by their -= case are interpreted as the same variables in the WIN32 -= platform. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/CMakeLists.txt deleted file mode 100644 index d6485d927c3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_ilogb_test1 - ${SOURCES} -) - -add_dependencies(paltest_ilogb_test1 coreclrpal) - -target_link_libraries(paltest_ilogb_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/test1.cpp index 67290f598f9..9fbd270d525 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/test1.cpp @@ -25,11 +25,11 @@ struct test }; /** - * validate + * ilogb_test1_validate * * test validation function */ -void __cdecl validate(double value, int expected) +void __cdecl ilogb_test1_validate(double value, int expected) { int result = ilogb(value); @@ -45,7 +45,7 @@ void __cdecl validate(double value, int expected) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_ilogb_test1_paltest_ilogb_test1, "c_runtime/ilogb/test1/paltest_ilogb_test1") { struct test tests[] = { @@ -92,7 +92,7 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected); + ilogb_test1_validate(tests[i].value, tests[i].expected); } PAL_Terminate(); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/testinfo.dat deleted file mode 100644 index 4d224a437db..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogb/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ilogb -Name = Call ilogb with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the ilogb function with various num/exponent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/CMakeLists.txt deleted file mode 100644 index 634ad8dc04f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_ilogbf_test1 - ${SOURCES} -) - -add_dependencies(paltest_ilogbf_test1 coreclrpal) - -target_link_libraries(paltest_ilogbf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/test1.cpp index b224e205990..c5022056c97 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/test1.cpp @@ -25,11 +25,11 @@ struct test }; /** - * validate + * ilogbf_test1_validate * * test validation function */ -void __cdecl validate(float value, int expected) +void __cdecl ilogbf_test1_validate(float value, int expected) { int result = ilogbf(value); @@ -45,7 +45,7 @@ void __cdecl validate(float value, int expected) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_ilogbf_test1_paltest_ilogbf_test1, "c_runtime/ilogbf/test1/paltest_ilogbf_test1") { struct test tests[] = { @@ -92,7 +92,7 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected); + ilogbf_test1_validate(tests[i].value, tests[i].expected); } PAL_Terminate(); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/testinfo.dat deleted file mode 100644 index a34d80a551d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/ilogbf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = ilogbf -Name = Call ilogbf with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the ilogbf function with various num/expfonent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt deleted file mode 100644 index d8b68ab5083..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isalnum_test1 - ${SOURCES} -) - -add_dependencies(paltest_isalnum_test1 coreclrpal) - -target_link_libraries(paltest_isalnum_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp index 78560d5320d..b7ec330ae94 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp @@ -21,7 +21,7 @@ struct testCase int character; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_isalnum_test1_paltest_isalnum_test1, "c_runtime/isalnum/test1/paltest_isalnum_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/testinfo.dat deleted file mode 100644 index 78d8cd2ee42..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalnum/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isalnum -Name = Positive Test for isalnum -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the isalnum function -= Check that a number of characters return the correct values for whether -= they are alpha/numeric or not. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt deleted file mode 100644 index 5d5170d473e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isalpha_test1 - ${SOURCES} -) - -add_dependencies(paltest_isalpha_test1 coreclrpal) - -target_link_libraries(paltest_isalpha_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp index 7e125b4817b..581f5d3e277 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp @@ -20,7 +20,7 @@ struct testCase int character; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_isalpha_test1_paltest_isalpha_test1, "c_runtime/isalpha/test1/paltest_isalpha_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/testinfo.dat deleted file mode 100644 index 3c1ea87c2cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isalpha/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isalpha -Name = Positive Test for isalpha -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the isalpha function -= Check that a number of characters return the correct values for whether -= they are alpha or not. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt deleted file mode 100644 index 94b40753a98..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isdigit_test1 - ${SOURCES} -) - -add_dependencies(paltest_isdigit_test1 coreclrpal) - -target_link_libraries(paltest_isdigit_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp index 28f2b08a8b3..d84029f9322 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_isdigit_test1_paltest_isdigit_test1, "c_runtime/isdigit/test1/paltest_isdigit_test1") { int i; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/testinfo.dat deleted file mode 100644 index 66e1e117e00..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isdigit/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isdigit -Name = Test #1 for isdigit -TYPE = DEFAULT -EXE1 = test1 -Description -=Checks every character against the known range of digits. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt deleted file mode 100644 index e0b01f7eaca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_islower_test1 - ${SOURCES} -) - -add_dependencies(paltest_islower_test1 coreclrpal) - -target_link_libraries(paltest_islower_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp index 77b99843b55..f8f6a7a4df2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp @@ -20,7 +20,7 @@ struct testCase int character; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_islower_test1_paltest_islower_test1, "c_runtime/islower/test1/paltest_islower_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/testinfo.dat deleted file mode 100644 index 72caf94d43c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/islower/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = islower -Name = Positive Test for islower -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the islower function -= Check that a number of characters return the correct values for whether -= they are lower case or not. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt deleted file mode 100644 index 58505f15d94..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - isprint.cpp -) - -add_executable(paltest_isprint_test1 - ${SOURCES} -) - -add_dependencies(paltest_isprint_test1 coreclrpal) - -target_link_libraries(paltest_isprint_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp index 57d1d515956..0d3f0618024 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_isprint_test1_paltest_isprint_test1, "c_runtime/isprint/test1/paltest_isprint_test1") { int err; int index; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/testinfo.dat deleted file mode 100644 index 15e53e39814..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = miscellaneous -Function = isprint -Name = Positive test for isprint API to check if a character is printable -TYPE = DEFAULT -EXE1 = isprint -Description -=Test the isprint to check if a character is printable diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt deleted file mode 100644 index d06c0d36ee1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_isprint_test2 - ${SOURCES} -) - -add_dependencies(paltest_isprint_test2 coreclrpal) - -target_link_libraries(paltest_isprint_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp index 08591afc7f2..9871c1d221a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_isprint_test2_paltest_isprint_test2, "c_runtime/isprint/test2/paltest_isprint_test2") { int err; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/testinfo.dat deleted file mode 100644 index ebd114d38f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isprint/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = miscellaneous -Function = isprint -Name = Test isprint API to check if out of range characters are not printable. -TYPE = DEFAULT -EXE1 = test2 -Description -=Test the isprint function to verify that out of range characters -=are not printable. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt deleted file mode 100644 index 678ea87bc96..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isspace_test1 - ${SOURCES} -) - -add_dependencies(paltest_isspace_test1 coreclrpal) - -target_link_libraries(paltest_isspace_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp index d5806ad7284..a5bdf2cb218 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_isspace_test1_paltest_isspace_test1, "c_runtime/isspace/test1/paltest_isspace_test1") { int i=0; long result = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/testinfo.dat deleted file mode 100644 index 2ac42ae0f7c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isspace/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isspace -Name = Positive Test for isspace -TYPE = DEFAULT -EXE1 = test1 -Description -= Run through every possible character. For each time that isspace returns -= >0, check through a list of the known space characters to ensure that it -= is really a space. Also, when it returns <=0, ensure that that character -= isn't a space. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt deleted file mode 100644 index 0eded6e61d6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isupper_test1 - ${SOURCES} -) - -add_dependencies(paltest_isupper_test1 coreclrpal) - -target_link_libraries(paltest_isupper_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp index b4894429919..6b297ebba48 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp @@ -20,7 +20,7 @@ struct testCase int character; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_isupper_test1_paltest_isupper_test1, "c_runtime/isupper/test1/paltest_isupper_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/testinfo.dat deleted file mode 100644 index 7cd4c66bb58..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isupper/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isupper -Name = Positive Test for isupper -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the isupper function -= Check that a number of characters return the correct values for whether -= they are upper case or not. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt deleted file mode 100644 index dce86a1f1cf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_iswdigit_test1 - ${SOURCES} -) - -add_dependencies(paltest_iswdigit_test1 coreclrpal) - -target_link_libraries(paltest_iswdigit_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp index 8b82b11e940..d7ea8d5513a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_iswdigit_test1_paltest_iswdigit_test1, "c_runtime/iswdigit/test1/paltest_iswdigit_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/testinfo.dat deleted file mode 100644 index c9bf834b0d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswdigit/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = iswdigit -Name = Positive Test for iswdigit -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the iswdigit function. -= Tests the passed parameter to iswdigit for being a -= digit ('0' - '9'). Also passes non-digits to make sure -= iswdigit picks them up. -= NOTE: There are three ASCII values that under Windows, -= iswdigit will return non-zero, indicating a digit. -= These values are quite apparently not digits: -= 178, 179, 185. These are not tested. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt deleted file mode 100644 index 8605249190d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_iswprint_test1 - ${SOURCES} -) - -add_dependencies(paltest_iswprint_test1 coreclrpal) - -target_link_libraries(paltest_iswprint_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp index ac6e9246227..cdc249a6272 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_iswprint_test1_paltest_iswprint_test1, "c_runtime/iswprint/test1/paltest_iswprint_test1") { WORD Info; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/testinfo.dat deleted file mode 100644 index e99abf3a5e5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswprint/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = iswprint -Name = Positive Test for iswprint -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests iswprint with all wide characters, ensuring they are -=consistent with GetStringTypeExW. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt deleted file mode 100644 index f5eef10caee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_iswspace_test1 - ${SOURCES} -) - -add_dependencies(paltest_iswspace_test1 coreclrpal) - -target_link_libraries(paltest_iswspace_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp index 14b78b4ec54..4d9de5d01a6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_iswspace_test1_paltest_iswspace_test1, "c_runtime/iswspace/test1/paltest_iswspace_test1") { int ret; int i; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/testinfo.dat deleted file mode 100644 index d401868b2de..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswspace/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = iswspace -Name = Positive Test for iswspace -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests iswspace with a range of wide characters. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt deleted file mode 100644 index 94c0cafa89b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_iswupper_test1 - ${SOURCES} -) - -add_dependencies(paltest_iswupper_test1 coreclrpal) - -target_link_libraries(paltest_iswupper_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp index 11602130667..7106aef6cd1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase WCHAR character; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_iswupper_test1_paltest_iswupper_test1, "c_runtime/iswupper/test1/paltest_iswupper_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/testinfo.dat deleted file mode 100644 index 14c4ac8c95e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/iswupper/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isupper -Name = Positive Test for iswupper -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the iswupper function -= Check that a number of characters return the correct values for whether -= they are upper case or not. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt deleted file mode 100644 index 95a78d400d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isxdigit_test1 - ${SOURCES} -) - -add_dependencies(paltest_isxdigit_test1 coreclrpal) - -target_link_libraries(paltest_isxdigit_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp index bbca8e1d225..c4c245cd255 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_isxdigit_test1_paltest_isxdigit_test1, "c_runtime/isxdigit/test1/paltest_isxdigit_test1") { int i; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/testinfo.dat deleted file mode 100644 index 983902fde35..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/isxdigit/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = isxdigit -Name = Positive Test for isxdigit -TYPE = DEFAULT -EXE1 = test1 -Description -= Run through every possible character. For each time that isxdigit returns -= 1, check through a list of the known hex characters to ensure that it -= is really a hex char. Also, when it returns 0, ensure that that character -= isn't a hex character. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt deleted file mode 100644 index 1255c58eee4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_llabs_test1 - ${SOURCES} -) - -add_dependencies(paltest_llabs_test1 coreclrpal) - -target_link_libraries(paltest_llabs_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp index a6ea7d475e5..05c23c0c7b2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp @@ -20,7 +20,7 @@ struct testCase __int64 AbsoluteLongLongValue; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_llabs_test1_paltest_llabs_test1, "c_runtime/llabs/test1/paltest_llabs_test1") { __int64 result=0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/testinfo.dat deleted file mode 100644 index 9d3b744cb3b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/llabs/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = labs -Name = Series of tests for labs: positive, negative, zero, maximum __int64 value. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call llabs on a series of values -- negative, positive, zero, -= and the largest negative value of an __int64. Ensure that they are all -= changed properly to their absoulte value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt deleted file mode 100644 index 9550b086213..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_log_test1 - ${SOURCES} -) - -add_dependencies(paltest_log_test1 coreclrpal) - -target_link_libraries(paltest_log_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp index 9c8f72cafcc..a780558a049 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp @@ -40,11 +40,11 @@ struct test }; /** - * validate + * log_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl log_test1_validate(double value, double expected, double variance) { double result = log(value); @@ -62,11 +62,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * log_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl log_test1_validate_isnan(double value) { double result = log(value); @@ -82,7 +82,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_log_test1_paltest_log_test1, "c_runtime/log/test1/paltest_log_test1") { struct test tests[] = { @@ -128,11 +128,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + log_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + log_test1_validate_isnan(PAL_NEGINF); + log_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/testinfo.dat deleted file mode 100644 index 67493229879..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = log -Name = Positive Test for log -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the log() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt deleted file mode 100644 index 75092a2f365..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_log10_test1 - ${SOURCES} -) - -add_dependencies(paltest_log10_test1 coreclrpal) - -target_link_libraries(paltest_log10_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp index b1444528c61..26d13508cc4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp @@ -46,11 +46,11 @@ struct test }; /** - * validate + * log10_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl log10_test1_validate(double value, double expected, double variance) { double result = log10(value); @@ -68,11 +68,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * log10_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl log10_test1_validate_isnan(double value) { double result = log10(value); @@ -88,7 +88,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_log10_test1_paltest_log10_test1, "c_runtime/log10/test1/paltest_log10_test1") { struct test tests[] = { @@ -134,11 +134,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + log10_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + log10_test1_validate_isnan(PAL_NEGINF); + log10_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/testinfo.dat deleted file mode 100644 index 1068593a04f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = log10 -Name = Positive Test for log10 -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the log10() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt deleted file mode 100644 index 4c035086986..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_log10f_test1 - ${SOURCES} -) - -add_dependencies(paltest_log10f_test1 coreclrpal) - -target_link_libraries(paltest_log10f_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/test1.cpp index d43ef2f43e9..a503ebaab74 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * log10f_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl log10f_test1_validate(float value, float expected, float variance) { float result = log10f(value); @@ -67,11 +67,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * log10f_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl log10f_test1_validate_isnan(float value) { float result = log10f(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_log10f_test1_paltest_log10f_test1, "c_runtime/log10f/test1/paltest_log10f_test1") { struct test tests[] = { @@ -132,11 +132,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + log10f_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + log10f_test1_validate_isnan(PAL_NEGINF); + log10f_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/testinfo.dat deleted file mode 100644 index 591853bc1dd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log10f/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = log10f -Name = Positive Test for log10f -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the log10f() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/CMakeLists.txt deleted file mode 100644 index efee18bc620..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_log2_test1 - ${SOURCES} -) - -add_dependencies(paltest_log2_test1 coreclrpal) - -target_link_libraries(paltest_log2_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/test1.cpp index c453e102a5f..8ca12f4dd54 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/test1.cpp @@ -40,11 +40,11 @@ struct test }; /** - * validate + * log2_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl log2_test1_validate(double value, double expected, double variance) { double result = log2(value); @@ -62,11 +62,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * log2_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl log2_test1_validate_isnan(double value) { double result = log2(value); @@ -82,7 +82,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_log2_test1_paltest_log2_test1, "c_runtime/log2/test1/paltest_log2_test1") { struct test tests[] = { @@ -127,11 +127,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + log2_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + log2_test1_validate_isnan(PAL_NEGINF); + log2_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/testinfo.dat deleted file mode 100644 index 14c34b08a0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = log2 -Name = Call log2 with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the log2 function with various num/exponent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/CMakeLists.txt deleted file mode 100644 index 6002cf7ad8c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_log2f_test1 - ${SOURCES} -) - -add_dependencies(paltest_log2f_test1 coreclrpal) - -target_link_libraries(paltest_log2f_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/test1.cpp index a4195d051b7..29de3c76de7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/test1.cpp @@ -39,11 +39,11 @@ struct test }; /** - * validate + * log2f_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl log2f_test1_validate(float value, float expected, float variance) { float result = log2f(value); @@ -61,11 +61,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * log2f_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl log2f_test1_validate_isnan(float value) { float result = log2f(value); @@ -81,7 +81,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_log2f_test1_paltest_log2f_test1, "c_runtime/log2f/test1/paltest_log2f_test1") { struct test tests[] = { @@ -126,11 +126,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + log2f_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + log2f_test1_validate_isnan(PAL_NEGINF); + log2f_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/testinfo.dat deleted file mode 100644 index ebda8b49d0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/log2f/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = log2f -Name = Call log2f with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the log2f function with various num/expfonent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt deleted file mode 100644 index 5cb727d0513..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_logf_test1 - ${SOURCES} -) - -add_dependencies(paltest_logf_test1 coreclrpal) - -target_link_libraries(paltest_logf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/test1.cpp index 3c7f10f0e9b..7980ae1b28e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/test1.cpp @@ -39,11 +39,11 @@ struct test }; /** - * validate + * logf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl logf_test1_validate(float value, float expected, float variance) { float result = logf(value); @@ -61,11 +61,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * logf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl logf_test1_validate_isnan(float value) { float result = logf(value); @@ -81,7 +81,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_logf_test1_paltest_logf_test1, "c_runtime/logf/test1/paltest_logf_test1") { struct test tests[] = { @@ -127,11 +127,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); + logf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); + logf_test1_validate_isnan(PAL_NEGINF); + logf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/testinfo.dat deleted file mode 100644 index 52236efce0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/logf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = logf -Name = Positive Test for logf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes a series of values to the logf() function, -= checking each for the expected result. Also checks -= for proper handling of out-of-range values. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt deleted file mode 100644 index 198ff68b42f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_malloc_test1 - ${SOURCES} -) - -add_dependencies(paltest_malloc_test1 coreclrpal) - -target_link_libraries(paltest_malloc_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp index be71d783297..2f713a0ee96 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_malloc_test1_paltest_malloc_test1, "c_runtime/malloc/test1/paltest_malloc_test1") { char *testA; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/testinfo.dat deleted file mode 100644 index d815414e38c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = malloc -Name = Positive Test for malloc -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that malloc properly allocates memory. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt deleted file mode 100644 index 03b0648f17f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_malloc_test2 - ${SOURCES} -) - -add_dependencies(paltest_malloc_test2 coreclrpal) - -target_link_libraries(paltest_malloc_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp index 6aa3e3f6b20..9f94f1050d6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_malloc_test2_paltest_malloc_test2, "c_runtime/malloc/test2/paltest_malloc_test2") { char *testA; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/testinfo.dat deleted file mode 100644 index c4fad6844f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/malloc/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = malloc -Name = Positive Test for malloc -TYPE = DEFAULT -EXE1 = test2 -Description -= Test that malloc(0) returns non-zero value diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt deleted file mode 100644 index 9fcc0837408..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_memchr_test1 - ${SOURCES} -) - -add_dependencies(paltest_memchr_test1 coreclrpal) - -target_link_libraries(paltest_memchr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp index 924e5c80a55..a7e44dbd911 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp @@ -25,7 +25,7 @@ struct testCase }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_memchr_test1_paltest_memchr_test1, "c_runtime/memchr/test1/paltest_memchr_test1") { int i = 0; char *result = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/testinfo.dat deleted file mode 100644 index d5e074c6ae7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memchr/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = memchr -Name = Positive Test for memchr -TYPE = DEFAULT -EXE1 = test1 -Description -= Create a string buffer, and check for a number of characters in it. -= Test to ensure it returns NULL if it can't find the character, and that -= the size argument works properly. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt deleted file mode 100644 index f48bac8058c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_memcmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_memcmp_test1 coreclrpal) - -target_link_libraries(paltest_memcmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp index 41c16d98e0f..c1a17f30a65 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_memcmp_test1_paltest_memcmp_test1, "c_runtime/memcmp/test1/paltest_memcmp_test1") { char testA[] = "aaaaaaaaaaaaaaaaaaaa"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/testinfo.dat deleted file mode 100644 index 852ea669788..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcmp/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = memcmp -Name = Positive Test for memcmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Check that memcmp find identical buffers to be identical, -= and that it correctly orders different buffers. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt deleted file mode 100644 index d7471acb984..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_memcpy_test1 - ${SOURCES} -) - -add_dependencies(paltest_memcpy_test1 coreclrpal) - -target_link_libraries(paltest_memcpy_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp index 26d59aa94ea..bbf674cedd8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_memcpy_test1_paltest_memcpy_test1, "c_runtime/memcpy/test1/paltest_memcpy_test1") { char testA[20]; char testB[20]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/testinfo.dat deleted file mode 100644 index f4ea0f1ee23..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memcpy/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = memcpy -Name = Positive Test for memcpy -TYPE = DEFAULT -EXE1 = test1 -Description -= Calls memcpy and verifies that the buffer was copied correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt deleted file mode 100644 index b5f8d4c7bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_memmove_test1 - ${SOURCES} -) - -add_dependencies(paltest_memmove_test1 coreclrpal) - -target_link_libraries(paltest_memmove_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp index 8bb0ee23153..476ba01f5f2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_memmove_test1_paltest_memmove_test1, "c_runtime/memmove/test1/paltest_memmove_test1") { char testA[11] = "abcdefghij"; char testB[15] = "aabbccddeeffgg"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/testinfo.dat deleted file mode 100644 index 777c1aacf31..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memmove/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = memmove -Name = Positive Test for memmove -TYPE = DEFAULT -EXE1 = test1 -Description -= Test that memmove correctly copies text from one buffer to another -= even when the buffers overlap. - - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt deleted file mode 100644 index bc24ed87b43..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_memset_test1 - ${SOURCES} -) - -add_dependencies(paltest_memset_test1 coreclrpal) - -target_link_libraries(paltest_memset_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp index 483e3b9c355..ee8d92fd4ab 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_memset_test1_paltest_memset_test1, "c_runtime/memset/test1/paltest_memset_test1") { char testA[22] = "bbbbbbbbbbbbbbbbbbbbb"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/testinfo.dat deleted file mode 100644 index 647bcd87f92..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/memset/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = memset -Name = Positive Test for memset -TYPE = DEFAULT -EXE1 = test1 -Description -= Check that memset correctly fills a destination buffer without overflowing it. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt deleted file mode 100644 index bc9e8870f96..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_modf_test1 - ${SOURCES} -) - -add_dependencies(paltest_modf_test1 coreclrpal) - -target_link_libraries(paltest_modf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp index b0beb7cabe1..726e524d0a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp @@ -47,11 +47,11 @@ struct test }; /** - * validate + * modf_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance, double expected_intpart, double variance_intpart) +void __cdecl modf_test1_validate(double value, double expected, double variance, double expected_intpart, double variance_intpart) { double result_intpart; double result = modf(value, &result_intpart); @@ -71,11 +71,11 @@ void __cdecl validate(double value, double expected, double variance, double exp } /** - * validate + * modf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl modf_test1_validate_isnan(double value) { double result_intpart; double result = modf(value, &result_intpart); @@ -92,7 +92,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_modf_test1_paltest_modf_test1, "c_runtime/modf/test1/paltest_modf_test1") { struct test tests[] = { @@ -124,11 +124,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance, tests[i].expected_intpart, tests[i].variance_intpart); - validate(-tests[i].value, -tests[i].expected, tests[i].variance, -tests[i].expected_intpart, tests[i].variance_intpart); + modf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance, tests[i].expected_intpart, tests[i].variance_intpart); + modf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance, -tests[i].expected_intpart, tests[i].variance_intpart); } - validate_isnan(PAL_NAN); + modf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/testinfo.dat deleted file mode 100644 index ad8b36486fc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modf/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = modf -Name = Positive Test for modf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to modf() a series of values, checking that -= each one return to correct value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt deleted file mode 100644 index a86d7e70a36..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_modff_test1 - ${SOURCES} -) - -add_dependencies(paltest_modff_test1 coreclrpal) - -target_link_libraries(paltest_modff_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp index a96cf7c78d7..898566b2739 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp @@ -46,11 +46,11 @@ struct test }; /** - * validate + * modff_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance, float expected_intpart, float variance_intpart) +void __cdecl modff_test1_validate(float value, float expected, float variance, float expected_intpart, float variance_intpart) { float result_intpart; float result = modff(value, &result_intpart); @@ -70,11 +70,11 @@ void __cdecl validate(float value, float expected, float variance, float expecte } /** - * validate + * modff_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl modff_test1_validate_isnan(float value) { float result_intpart; float result = modff(value, &result_intpart); @@ -91,7 +91,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_modff_test1_paltest_modff_test1, "c_runtime/modff/test1/paltest_modff_test1") { struct test tests[] = { @@ -123,11 +123,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance, tests[i].expected_intpart, tests[i].variance_intpart); - validate(-tests[i].value, -tests[i].expected, tests[i].variance, -tests[i].expected_intpart, tests[i].variance_intpart); + modff_test1_validate( tests[i].value, tests[i].expected, tests[i].variance, tests[i].expected_intpart, tests[i].variance_intpart); + modff_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance, -tests[i].expected_intpart, tests[i].variance_intpart); } - validate_isnan(PAL_NAN); + modff_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/testinfo.dat deleted file mode 100644 index 26429e91f48..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/modff/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = modff -Name = Positive Test for modff -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to modff() a series of values, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt deleted file mode 100644 index 86ae740da67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_pow_test1 - ${SOURCES} -) - -add_dependencies(paltest_pow_test1 coreclrpal) - -target_link_libraries(paltest_pow_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp index 159d3956ea9..22f482868b3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp @@ -43,11 +43,11 @@ struct test }; /** - * validate + * pow_test1_validate * * test validation function */ -void __cdecl validate(double x, double y, double expected, double variance) +void __cdecl pow_test1_validate(double x, double y, double expected, double variance) { double result = pow(x, y); @@ -65,11 +65,11 @@ void __cdecl validate(double x, double y, double expected, double variance) } /** - * validate + * pow_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double x, double y) +void __cdecl pow_test1_validate_isnan(double x, double y) { double result = pow(x, y); @@ -85,7 +85,7 @@ void __cdecl validate_isnan(double x, double y) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_pow_test1_paltest_pow_test1, "c_runtime/pow/test1/paltest_pow_test1") { struct test tests[] = { @@ -203,26 +203,26 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].x, tests[i].y, tests[i].expected, tests[i].variance); + pow_test1_validate(tests[i].x, tests[i].y, tests[i].expected, tests[i].variance); } - validate_isnan(-10, -1.5707963267948966); // y: -(pi / 2) - validate_isnan(-10, -0.78539816339744828); // y: -(pi / 4) - validate_isnan(-10, 0.78539816339744828); // y: pi / 4 - validate_isnan(-10, 1.5707963267948966); // y: pi / 2 + pow_test1_validate_isnan(-10, -1.5707963267948966); // y: -(pi / 2) + pow_test1_validate_isnan(-10, -0.78539816339744828); // y: -(pi / 4) + pow_test1_validate_isnan(-10, 0.78539816339744828); // y: pi / 4 + pow_test1_validate_isnan(-10, 1.5707963267948966); // y: pi / 2 - validate_isnan(-2.7182818284590452, -1.5707963267948966); // x: -(e) y: -(pi / 2) - validate_isnan(-2.7182818284590452, -0.78539816339744828); // x: -(e) y: -(pi / 4) - validate_isnan(-2.7182818284590452, 0.78539816339744828); // x: -(e) y: pi / 4 - validate_isnan(-2.7182818284590452, 1.5707963267948966); // x: -(e) y: pi / 2 + pow_test1_validate_isnan(-2.7182818284590452, -1.5707963267948966); // x: -(e) y: -(pi / 2) + pow_test1_validate_isnan(-2.7182818284590452, -0.78539816339744828); // x: -(e) y: -(pi / 4) + pow_test1_validate_isnan(-2.7182818284590452, 0.78539816339744828); // x: -(e) y: pi / 4 + pow_test1_validate_isnan(-2.7182818284590452, 1.5707963267948966); // x: -(e) y: pi / 2 - validate_isnan(PAL_NEGINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NEGINF); + pow_test1_validate_isnan(PAL_NEGINF, PAL_NAN); + pow_test1_validate_isnan(PAL_NAN, PAL_NEGINF); - validate_isnan(PAL_POSINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_POSINF); + pow_test1_validate_isnan(PAL_POSINF, PAL_NAN); + pow_test1_validate_isnan(PAL_NAN, PAL_POSINF); - validate_isnan(PAL_NAN, PAL_NAN); + pow_test1_validate_isnan(PAL_NAN, PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/testinfo.dat deleted file mode 100644 index 0dae5d52460..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/pow/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = pow -Name = Call pow with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the pow function with various num/exponent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt deleted file mode 100644 index 53443f15598..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_powf_test1 - ${SOURCES} -) - -add_dependencies(paltest_powf_test1 coreclrpal) - -target_link_libraries(paltest_powf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/test1.cpp index 24a23e04f9e..5e704f2d59b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/test1.cpp @@ -42,11 +42,11 @@ struct test }; /** - * validate + * powf_test1_validate * * test validation function */ -void __cdecl validate(float x, float y, float expected, float variance) +void __cdecl powf_test1_validate(float x, float y, float expected, float variance) { float result = powf(x, y); @@ -64,11 +64,11 @@ void __cdecl validate(float x, float y, float expected, float variance) } /** - * validate + * powf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float x, float y) +void __cdecl powf_test1_validate_isnan(float x, float y) { float result = powf(x, y); @@ -84,7 +84,7 @@ void __cdecl validate_isnan(float x, float y) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_powf_test1_paltest_powf_test1, "c_runtime/powf/test1/paltest_powf_test1") { struct test tests[] = { @@ -202,26 +202,26 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].x, tests[i].y, tests[i].expected, tests[i].variance); + powf_test1_validate(tests[i].x, tests[i].y, tests[i].expected, tests[i].variance); } - validate_isnan(-10, -1.57079633f); // y: -(pi / 2) - validate_isnan(-10, -0.785398163f); // y: -(pi / 4) - validate_isnan(-10, 0.785398163f); // y: pi / 4 - validate_isnan(-10, 1.57079633f); // y: pi / 2 + powf_test1_validate_isnan(-10, -1.57079633f); // y: -(pi / 2) + powf_test1_validate_isnan(-10, -0.785398163f); // y: -(pi / 4) + powf_test1_validate_isnan(-10, 0.785398163f); // y: pi / 4 + powf_test1_validate_isnan(-10, 1.57079633f); // y: pi / 2 - validate_isnan(-2.71828183f, -1.57079633f); // x: -(e) y: -(pi / 2) - validate_isnan(-2.71828183f, -0.785398163f); // x: -(e) y: -(pi / 4) - validate_isnan(-2.71828183f, 0.785398163f); // x: -(e) y: pi / 4 - validate_isnan(-2.71828183f, 1.57079633f); // x: -(e) y: pi / 2 + powf_test1_validate_isnan(-2.71828183f, -1.57079633f); // x: -(e) y: -(pi / 2) + powf_test1_validate_isnan(-2.71828183f, -0.785398163f); // x: -(e) y: -(pi / 4) + powf_test1_validate_isnan(-2.71828183f, 0.785398163f); // x: -(e) y: pi / 4 + powf_test1_validate_isnan(-2.71828183f, 1.57079633f); // x: -(e) y: pi / 2 - validate_isnan(PAL_NEGINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_NEGINF); + powf_test1_validate_isnan(PAL_NEGINF, PAL_NAN); + powf_test1_validate_isnan(PAL_NAN, PAL_NEGINF); - validate_isnan(PAL_POSINF, PAL_NAN); - validate_isnan(PAL_NAN, PAL_POSINF); + powf_test1_validate_isnan(PAL_POSINF, PAL_NAN); + powf_test1_validate_isnan(PAL_NAN, PAL_POSINF); - validate_isnan(PAL_NAN, PAL_NAN); + powf_test1_validate_isnan(PAL_NAN, PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/testinfo.dat deleted file mode 100644 index 2194e108465..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/powf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = powf -Name = Call powf with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the powf function with various num/expfonent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/CMakeLists.txt deleted file mode 100644 index 256753a6364..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/printf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/printf.h index 780cf8f01cf..7d6a9c75c4e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/printf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/printf.h @@ -13,7 +13,7 @@ #ifndef __printf_H__ #define __printf_H__ -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_printf(const char *formatstr, char* param, const char *checkstr) { int ret; @@ -24,8 +24,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) strlen(checkstr), ret); } } +#define DoStrTest DoStrTest_printf -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_printf(const char *formatstr, WCHAR* param, const char *checkstr) { int ret; @@ -36,8 +37,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) strlen(checkstr), ret); } } +#define DoWStrTest DoWStrTest_printf -void DoPointerTest(const char *formatstr, void* param, char* paramstr, +inline void DoPointerTest_printf(const char *formatstr, void* param, char* paramstr, const char *checkstr1) { int ret; @@ -49,8 +51,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, strlen(checkstr1), ret); } } +#define DoPointerTest DoPointerTest_printf -void DoCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoCountTest_printf(const char *formatstr, int param, const char *checkstr) { int ret; int n = -1; @@ -68,8 +71,9 @@ void DoCountTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoCountTest DoCountTest_printf -void DoShortCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_printf(const char *formatstr, int param, const char *checkstr) { int ret; short int n = -1; @@ -87,9 +91,9 @@ void DoShortCountTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoShortCountTest DoShortCountTest_printf - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_printf(const char *formatstr, char param, const char *checkstr) { int ret; @@ -100,8 +104,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) strlen(checkstr), ret); } } +#define DoCharTest DoCharTest_printf -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_printf(const char *formatstr, WCHAR param, const char *checkstr) { int ret; @@ -112,8 +117,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) strlen(checkstr), ret); } } +#define DoWCharTest DoWCharTest_printf -void DoNumTest(const char *formatstr, int param, const char *checkstr) +inline void DoNumTest_printf(const char *formatstr, int param, const char *checkstr) { int ret; @@ -124,8 +130,9 @@ void DoNumTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoNumTest DoNumTest_printf -void DoI64Test(const char *formatstr, INT64 param, char *valuestr, +inline void DoI64Test_printf(const char *formatstr, INT64 param, char *valuestr, const char *checkstr1) { int ret; @@ -137,8 +144,9 @@ void DoI64Test(const char *formatstr, INT64 param, char *valuestr, strlen(checkstr1), ret); } } +#define DoI64Test DoI64Test_printf -void DoDoubleTest(const char *formatstr, double param, +inline void DoDoubleTest_printf(const char *formatstr, double param, const char *checkstr1, const char *checkstr2) { int ret; @@ -150,8 +158,9 @@ void DoDoubleTest(const char *formatstr, double param, strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoDoubleTest DoDoubleTest_printf -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_printf(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { int ret; @@ -163,8 +172,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoArgumentPrecTest DoArgumentPrecTest_printf -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_printf(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { int ret; @@ -176,6 +186,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_printf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt deleted file mode 100644 index f3cce9c786a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_printf_test1 - ${SOURCES} -) - -add_dependencies(paltest_printf_test1 coreclrpal) - -target_link_libraries(paltest_printf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp index 3b941ae215b..6523995e558 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../printf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test1_paltest_printf_test1, "c_runtime/printf/test1/paltest_printf_test1") { char checkstr[] = "hello world"; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/testinfo.dat deleted file mode 100644 index dedc3cff90e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if printf works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt deleted file mode 100644 index 5fa23114334..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_printf_test10 - ${SOURCES} -) - -add_dependencies(paltest_printf_test10 coreclrpal) - -target_link_libraries(paltest_printf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp index 122eacd7d07..acad7053b5c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp @@ -17,7 +17,7 @@ #include "../printf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test10_paltest_printf_test10, "c_runtime/printf/test10/paltest_printf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/testinfo.dat deleted file mode 100644 index 994c781b056..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests printf with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt deleted file mode 100644 index 52b7202b48a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_printf_test11 - ${SOURCES} -) - -add_dependencies(paltest_printf_test11 coreclrpal) - -target_link_libraries(paltest_printf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp index be94cb6b6d7..36dbdf3197c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../printf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test11_paltest_printf_test11, "c_runtime/printf/test11/paltest_printf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/testinfo.dat deleted file mode 100644 index aeb1aba1d1b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests printf with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt deleted file mode 100644 index aa19c4bb77f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_printf_test12 - ${SOURCES} -) - -add_dependencies(paltest_printf_test12 coreclrpal) - -target_link_libraries(paltest_printf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp index 00328193ef1..5d6ed79be12 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp @@ -17,7 +17,7 @@ #include "../printf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test12_paltest_printf_test12, "c_runtime/printf/test12/paltest_printf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/testinfo.dat deleted file mode 100644 index 100e1bf35fe..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests printf with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt deleted file mode 100644 index e715bdde813..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_printf_test13 - ${SOURCES} -) - -add_dependencies(paltest_printf_test13 coreclrpal) - -target_link_libraries(paltest_printf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp index d42313f90c0..dbda8dc2276 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test13_paltest_printf_test13, "c_runtime/printf/test13/paltest_printf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/testinfo.dat deleted file mode 100644 index eb8dd5351f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests printf with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt deleted file mode 100644 index 878392a4cbd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_printf_test14 - ${SOURCES} -) - -add_dependencies(paltest_printf_test14 coreclrpal) - -target_link_libraries(paltest_printf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp index 5a999122324..dcfa4a54a92 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test14_paltest_printf_test14, "c_runtime/printf/test14/paltest_printf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/testinfo.dat deleted file mode 100644 index d13bbd2ec68..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests printf with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt deleted file mode 100644 index 7630cbbb69e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_printf_test15 - ${SOURCES} -) - -add_dependencies(paltest_printf_test15 coreclrpal) - -target_link_libraries(paltest_printf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp index 03ba391fde5..a53c4a4c9de 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test15_paltest_printf_test15, "c_runtime/printf/test15/paltest_printf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/testinfo.dat deleted file mode 100644 index 2c917d7b30b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests printf with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt deleted file mode 100644 index 6d4082e2e0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_printf_test16 - ${SOURCES} -) - -add_dependencies(paltest_printf_test16 coreclrpal) - -target_link_libraries(paltest_printf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp index 186568262a8..a2fbc429e8b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test16_paltest_printf_test16, "c_runtime/printf/test16/paltest_printf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/testinfo.dat deleted file mode 100644 index c7e2f771b3f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests printf with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt deleted file mode 100644 index 3873af8f414..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_printf_test17 - ${SOURCES} -) - -add_dependencies(paltest_printf_test17 coreclrpal) - -target_link_libraries(paltest_printf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp index 58dbc37feaa..70a574aaa7e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test17_paltest_printf_test17, "c_runtime/printf/test17/paltest_printf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/testinfo.dat deleted file mode 100644 index 203125deed7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests printf with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt deleted file mode 100644 index 75791354e7d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_printf_test18 - ${SOURCES} -) - -add_dependencies(paltest_printf_test18 coreclrpal) - -target_link_libraries(paltest_printf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp index 25f3c91ee3d..17e9aabe8e8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test18_paltest_printf_test18, "c_runtime/printf/test18/paltest_printf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/testinfo.dat deleted file mode 100644 index f8af9313962..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests printf with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt deleted file mode 100644 index 98321bc653e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_printf_test19 - ${SOURCES} -) - -add_dependencies(paltest_printf_test19 coreclrpal) - -target_link_libraries(paltest_printf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp index ecef021d658..d70aad2bd72 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test19_paltest_printf_test19, "c_runtime/printf/test19/paltest_printf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/testinfo.dat deleted file mode 100644 index bf57331b4a4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests printf with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt deleted file mode 100644 index 7208d56ca8d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_printf_test2 - ${SOURCES} -) - -add_dependencies(paltest_printf_test2 coreclrpal) - -target_link_libraries(paltest_printf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp index 5ddcce29c33..b32f36d3072 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test2_paltest_printf_test2, "c_runtime/printf/test2/paltest_printf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/testinfo.dat deleted file mode 100644 index b1813b134f3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests printf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt deleted file mode 100644 index b75a50ed076..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_printf_test3 - ${SOURCES} -) - -add_dependencies(paltest_printf_test3 coreclrpal) - -target_link_libraries(paltest_printf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp index 5778ebc0ab8..b7ff6bf60e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test3_paltest_printf_test3, "c_runtime/printf/test3/paltest_printf_test3") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/testinfo.dat deleted file mode 100644 index db5f9770184..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests printf with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt deleted file mode 100644 index 6ce28017e28..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_printf_test4 - ${SOURCES} -) - -add_dependencies(paltest_printf_test4 coreclrpal) - -target_link_libraries(paltest_printf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp index d673fdda441..507308779bd 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../printf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test4_paltest_printf_test4, "c_runtime/printf/test4/paltest_printf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/testinfo.dat deleted file mode 100644 index 2aef0fe7666..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests printf with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt deleted file mode 100644 index 885448a4a54..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_printf_test5 - ${SOURCES} -) - -add_dependencies(paltest_printf_test5 coreclrpal) - -target_link_libraries(paltest_printf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp index b02195a02f1..15e806bf0e8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test5_paltest_printf_test5, "c_runtime/printf/test5/paltest_printf_test5") { char *longStr = "really-long-string-that-just-keeps-going-on-and-on-and-on.." diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/testinfo.dat deleted file mode 100644 index a0eec366238..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests printf with the count specifier diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt deleted file mode 100644 index 21224fda582..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_printf_test6 - ${SOURCES} -) - -add_dependencies(paltest_printf_test6 coreclrpal) - -target_link_libraries(paltest_printf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp index ab55cb65b91..8ba3d68004c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test6_paltest_printf_test6, "c_runtime/printf/test6/paltest_printf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/testinfo.dat deleted file mode 100644 index a39fbd8cff5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests printf with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt deleted file mode 100644 index 3a8f15e7e2b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_printf_test7 - ${SOURCES} -) - -add_dependencies(paltest_printf_test7 coreclrpal) - -target_link_libraries(paltest_printf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp index 6ec7a29a567..1e34f0aaef8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test7_paltest_printf_test7, "c_runtime/printf/test7/paltest_printf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/testinfo.dat deleted file mode 100644 index 62dfef223a7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests printf with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt deleted file mode 100644 index b79c169cf95..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_printf_test8 - ${SOURCES} -) - -add_dependencies(paltest_printf_test8 coreclrpal) - -target_link_libraries(paltest_printf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp index bf3f76d4c9b..7b93fda0e80 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test8_paltest_printf_test8, "c_runtime/printf/test8/paltest_printf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/testinfo.dat deleted file mode 100644 index 70d98766882..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests printf with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt deleted file mode 100644 index f7aea6862d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_printf_test9 - ${SOURCES} -) - -add_dependencies(paltest_printf_test9 coreclrpal) - -target_link_libraries(paltest_printf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp index bad50d00a9e..00de8a2abc1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_printf_test9_paltest_printf_test9, "c_runtime/printf/test9/paltest_printf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/testinfo.dat deleted file mode 100644 index 4737eb08553..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/printf/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = printf -Name = Positive Test for printf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests printf with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt deleted file mode 100644 index 56e2de25e50..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_qsort_test1 - ${SOURCES} -) - -add_dependencies(paltest_qsort_test1 coreclrpal) - -target_link_libraries(paltest_qsort_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp index 674ec965fc8..57b288a809e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp @@ -13,12 +13,12 @@ #include <palsuite.h> -int __cdecl charcmp(const void *pa, const void *pb) +int __cdecl charcmp_qsort_test1(const void *pa, const void *pb) { return memcmp(pa, pb, 1); } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_qsort_test1_paltest_qsort_test1, "c_runtime/qsort/test1/paltest_qsort_test1") { char before[] = "cgaiehdbjf"; const char after[] = "abcdefghij"; @@ -29,7 +29,7 @@ int __cdecl main(int argc, char **argv) } - qsort(before, sizeof(before) - 1, sizeof(char), charcmp); + qsort(before, sizeof(before) - 1, sizeof(char), charcmp_qsort_test1); if (memcmp(before, after, sizeof(before)) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/testinfo.dat deleted file mode 100644 index d15798b1a92..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = qsort -Name = Positive Test for qsort -TYPE = DEFAULT -EXE1 = test1 -Description -= Calls qsort to sort a buffer, and verifies that it has done the job correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt deleted file mode 100644 index f3f89934793..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_qsort_test2 - ${SOURCES} -) - -add_dependencies(paltest_qsort_test2 coreclrpal) - -target_link_libraries(paltest_qsort_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp index 9500002a939..20d76c5677e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp @@ -13,12 +13,12 @@ #include <palsuite.h> -int __cdecl twocharcmp(const void *pa, const void *pb) +int __cdecl twocharcmp_qsort_test2(const void *pa, const void *pb) { return memcmp(pa, pb, 2); } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_qsort_test2_paltest_qsort_test2, "c_runtime/qsort/test2/paltest_qsort_test2") { char before[] = "ccggaaiieehhddbbjjff"; const char after[] = "aabbccddeeffgghhiijj"; @@ -29,7 +29,7 @@ int __cdecl main(int argc, char **argv) } - qsort(before, (sizeof(before) - 1) / 2, 2 * sizeof(char), twocharcmp); + qsort(before, (sizeof(before) - 1) / 2, 2 * sizeof(char), twocharcmp_qsort_test2); if (memcmp(before, after, sizeof(before)) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/testinfo.dat deleted file mode 100644 index 8946ab67a5b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/qsort/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = qsort -Name = Positive Test for qsort -TYPE = DEFAULT -EXE1 = test2 -Description -= Calls qsort to sort a buffer, and verifies that it has done the job correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt deleted file mode 100644 index fd44b33443b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_rand_srand_test1 - ${SOURCES} -) - -add_dependencies(paltest_rand_srand_test1 coreclrpal) - -target_link_libraries(paltest_rand_srand_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp index 68888ca8e5f..fea66560c1f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_rand_srand_test1_paltest_rand_srand_test1, "c_runtime/rand_srand/test1/paltest_rand_srand_test1") { int RandNumber[10]; int TempRandNumber; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/testinfo.dat deleted file mode 100644 index 272e23f038f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/rand_srand/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = rand and srand -Name = Positive Test for rand and srand -TYPE = DEFAULT -EXE1 = test1 -Description -= Call rand without srand and get 10 random number batch 1. -= call srand with seed 2, get 10 other random number and verify -= that numbers are different from the batch 1. -= Set the seed to 1, get 10 other random number and verify -= that the generated number are the same as batch 1. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt deleted file mode 100644 index b57d84b91b5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_realloc_test1 - ${SOURCES} -) - -add_dependencies(paltest_realloc_test1 coreclrpal) - -target_link_libraries(paltest_realloc_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp index ff812e1f0d5..edd075da23f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_realloc_test1_paltest_realloc_test1, "c_runtime/realloc/test1/paltest_realloc_test1") { char *testA; const int len1 = 10; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/testinfo.dat deleted file mode 100644 index 71010959742..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/realloc/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = realloc -Name = Positive Test for realloc -TYPE = DEFAULT -EXE1 = test1 -Description -= Uses realloc to allocate and realloate memory, checking that memory -= contents are copied when the memory is reallocated. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/CMakeLists.txt deleted file mode 100644 index 96abef47fc1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_scalbn_test1 - ${SOURCES} -) - -add_dependencies(paltest_scalbn_test1 coreclrpal) - -target_link_libraries(paltest_scalbn_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/test1.cpp index 22c61328edd..a36f2de02ed 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/test1.cpp @@ -41,11 +41,11 @@ struct test }; /** - * validate + * scalbn_test1_validate * * test validation function */ -void __cdecl validate(double value, int exponent, double expected, double variance) +void __cdecl scalbn_test1_validate(double value, int exponent, double expected, double variance) { double result = scalbn(value, exponent); @@ -63,11 +63,11 @@ void __cdecl validate(double value, int exponent, double expected, double varian } /** - * validate + * scalbn_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value, int exponent) +void __cdecl scalbn_test1_validate_isnan(double value, int exponent) { double result = scalbn(value, exponent); @@ -83,7 +83,7 @@ void __cdecl validate_isnan(double value, int exponent) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_scalbn_test1_paltest_scalbn_test1, "c_runtime/scalbn/test1/paltest_scalbn_test1") { struct test tests[] = { @@ -129,10 +129,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].exponent, tests[i].expected, tests[i].variance); + scalbn_test1_validate(tests[i].value, tests[i].exponent, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN, 2147483647); + scalbn_test1_validate_isnan(PAL_NAN, 2147483647); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/testinfo.dat deleted file mode 100644 index d39477b81d8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbn/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = scalbn -Name = Call scalbn with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the scalbn function with various num/exponent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/CMakeLists.txt deleted file mode 100644 index c5a1dc2872c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_scalbnf_test1 - ${SOURCES} -) - -add_dependencies(paltest_scalbnf_test1 coreclrpal) - -target_link_libraries(paltest_scalbnf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/test1.cpp index 10c7b2a7178..28ac6405bfe 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/test1.cpp @@ -40,11 +40,11 @@ struct test }; /** - * validate + * scalbnf_test1_validate * * test validation function */ -void __cdecl validate(float value, int exponent, float expected, float variance) +void __cdecl scalbnf_test1_validate(float value, int exponent, float expected, float variance) { float result = scalbnf(value, exponent); @@ -62,11 +62,11 @@ void __cdecl validate(float value, int exponent, float expected, float variance) } /** - * validate + * scalbnf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value, int exponent) +void __cdecl scalbnf_test1_validate_isnan(float value, int exponent) { float result = scalbnf(value, exponent); @@ -82,7 +82,7 @@ void __cdecl validate_isnan(float value, int exponent) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_scalbnf_test1_paltest_scalbnf_test1, "c_runtime/scalbnf/test1/paltest_scalbnf_test1") { struct test tests[] = { @@ -128,10 +128,10 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].exponent, tests[i].expected, tests[i].variance); + scalbnf_test1_validate(tests[i].value, tests[i].exponent, tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN, 2147483647); + scalbnf_test1_validate_isnan(PAL_NAN, 2147483647); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/testinfo.dat deleted file mode 100644 index 3fe3745eacf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/scalbnf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = scalbnf -Name = Call scalbnf with some std input/output. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the scalbnf function with various num/expfonent pairs -= that should produce std answers. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt deleted file mode 100644 index 6a7549a6bdb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sin_test1 - ${SOURCES} -) - -add_dependencies(paltest_sin_test1 coreclrpal) - -target_link_libraries(paltest_sin_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp index 7c83f7281f5..bcfeb4baa05 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * sin_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl sin_test1_validate(double value, double expected, double variance) { double result = sin(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * sin_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl sin_test1_validate_isnan(double value) { double result = sin(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sin_test1_paltest_sin_test1, "c_runtime/sin/test1/paltest_sin_test1") { struct test tests[] = { @@ -117,13 +117,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + sin_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + sin_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + sin_test1_validate_isnan(PAL_NEGINF); + sin_test1_validate_isnan(PAL_NAN); + sin_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/testinfo.dat deleted file mode 100644 index 8ec3977815b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sin/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sin -Name = Positive Test for sin -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to sin() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt deleted file mode 100644 index 76ceb1e94d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_sinf_test1 - ${SOURCES} -) - -add_dependencies(paltest_sinf_test1 coreclrpal) - -target_link_libraries(paltest_sinf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/test1.cpp index 0fa2935f190..1481843fed4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * sinf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl sinf_test1_validate(float value, float expected, float variance) { float result = sinf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * sinf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl sinf_test1_validate_isnan(float value) { float result = sinf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sinf_test1_paltest_sinf_test1, "c_runtime/sinf/test1/paltest_sinf_test1") { struct test tests[] = { @@ -116,13 +116,13 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + sinf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + sinf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + sinf_test1_validate_isnan(PAL_NEGINF); + sinf_test1_validate_isnan(PAL_NAN); + sinf_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/testinfo.dat deleted file mode 100644 index 2d70efaab92..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sinf -Name = Positive Test for sinf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to sinf() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt deleted file mode 100644 index bd74171f425..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sinh_test1 - ${SOURCES} -) - -add_dependencies(paltest_sinh_test1 coreclrpal) - -target_link_libraries(paltest_sinh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp index 5dc6282a022..2879bf16aea 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * sinh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl sinh_test1_validate(double value, double expected, double variance) { double result = sinh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * sinh_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl sinh_test1_validate_isnan(double value) { double result = sinh(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sinh_test1_paltest_sinh_test1, "c_runtime/sinh/test1/paltest_sinh_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + sinh_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + sinh_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + sinh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/testinfo.dat deleted file mode 100644 index a8f09d8fc28..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinh/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sinh -Name = Positive Test for sinh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to sinh() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt deleted file mode 100644 index 811324b05db..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_sinhf_test1 - ${SOURCES} -) - -add_dependencies(paltest_sinhf_test1 coreclrpal) - -target_link_libraries(paltest_sinhf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/test1.cpp index 6c00b859969..a67ab96a410 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * sinhf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl sinhf_test1_validate(float value, float expected, float variance) { float result = sinhf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * sinhf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl sinhf_test1_validate_isnan(float value) { float result = sinhf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sinhf_test1_paltest_sinhf_test1, "c_runtime/sinhf/test1/paltest_sinhf_test1") { struct test tests[] = { @@ -117,11 +117,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + sinhf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + sinhf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + sinhf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/testinfo.dat deleted file mode 100644 index 1af96771ef9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sinhf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sinhf -Name = Positive Test for sinhf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to sinhf() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/sprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/sprintf_s.h index cc3eff5fd95..8cfe4507ac1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/sprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/sprintf_s.h @@ -13,7 +13,7 @@ #ifndef __SPRINTF_S_H__ #define __SPRINTF_S_H__ -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_sprintf_s(const char *formatstr, char* param, const char *checkstr) { char buf[256] = { 0 }; @@ -25,8 +25,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) param, formatstr, checkstr, buf); } } +#define DoStrTest DoStrTest_sprintf_s -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_sprintf_s(const char *formatstr, WCHAR* param, const char *checkstr) { char buf[256] = { 0 }; @@ -38,8 +39,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) convertC(param), formatstr, checkstr, buf); } } +#define DoWStrTest DoWStrTest_sprintf_s -void DoPointerTest(const char *formatstr, void* param, char* paramstr, +inline void DoPointerTest_sprintf_s(const char *formatstr, void* param, char* paramstr, const char *checkstr1) { char buf[256] = { 0 }; @@ -52,8 +54,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, paramstr, formatstr, checkstr1, buf); } } +#define DoPointerTest DoPointerTest_sprintf_s -void DoCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoCountTest_sprintf_s(const char *formatstr, int param, const char *checkstr) { char buf[512] = { 0 }; int n = -1; @@ -70,8 +73,9 @@ void DoCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoCountTest DoCountTest_sprintf_s -void DoShortCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_sprintf_s(const char *formatstr, int param, const char *checkstr) { char buf[256] = { 0 }; short int n = -1; @@ -88,9 +92,9 @@ void DoShortCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoShortCountTest DoShortCountTest_sprintf_s - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_sprintf_s(const char *formatstr, char param, const char *checkstr) { char buf[256] = { 0 }; @@ -102,8 +106,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) param, param, formatstr, checkstr, buf); } } +#define DoCharTest DoCharTest_sprintf_s -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_sprintf_s(const char *formatstr, WCHAR param, const char *checkstr) { char buf[256] = { 0 }; @@ -115,8 +120,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) (char)param, param, formatstr, checkstr, buf); } } +#define DoWCharTest DoWCharTest_sprintf_s -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_sprintf_s(const char *formatstr, int value, const char *checkstr) { char buf[256] = { 0 }; @@ -128,8 +134,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) value, formatstr, checkstr, buf); } } +#define DoNumTest DoNumTest_sprintf_s -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) +inline void DoI64Test_sprintf_s(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) { char buf[256] = { 0 }; @@ -141,8 +148,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c valuestr, formatstr, checkstr1, buf); } } +#define DoI64Test DoI64Test_sprintf_s -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, +inline void DoDoubleTest_sprintf_s(const char *formatstr, double value, const char *checkstr1, const char *checkstr2) { char buf[256] = { 0 }; @@ -156,8 +164,9 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, value, formatstr, checkstr1, checkstr2, buf); } } +#define DoDoubleTest DoDoubleTest_sprintf_s -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_sprintf_s(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -172,8 +181,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, } } +#define DoArgumentPrecTest DoArgumentPrecTest_sprintf_s -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_sprintf_s(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -188,6 +198,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_sprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt deleted file mode 100644 index d190fd7beb5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test1 coreclrpal) - -target_link_libraries(paltest_sprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/test1.cpp index 95cabe068c3..12342858aff 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/test1.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test1_paltest_sprintf_test1, "c_runtime/sprintf_s/test1/paltest_sprintf_test1") { char checkstr[] = "hello world"; char buf[256]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/testinfo.dat deleted file mode 100644 index dd7e48e96b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if sprintf_s works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt deleted file mode 100644 index 6ebb5559129..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_sprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test10 coreclrpal) - -target_link_libraries(paltest_sprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/test10.cpp index fec21236875..915fae9900e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/test10.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test10_paltest_sprintf_test10, "c_runtime/sprintf_s/test10/paltest_sprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/testinfo.dat deleted file mode 100644 index 5bef07c257d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests sprintf_s with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt deleted file mode 100644 index 417db26057c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_sprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test11 coreclrpal) - -target_link_libraries(paltest_sprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/test11.cpp index d2d21e3222c..4ce47e7ae3f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/test11.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test11_paltest_sprintf_test11, "c_runtime/sprintf_s/test11/paltest_sprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/testinfo.dat deleted file mode 100644 index c65a26c7081..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests sprintf_s with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt deleted file mode 100644 index c9c1025217b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_sprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test12 coreclrpal) - -target_link_libraries(paltest_sprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/test12.cpp index 44da16677ac..b41cf9b631f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/test12.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test12_paltest_sprintf_test12, "c_runtime/sprintf_s/test12/paltest_sprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/testinfo.dat deleted file mode 100644 index 99db86d551d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests sprintf_s with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt deleted file mode 100644 index 7c5c01483cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_sprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test13 coreclrpal) - -target_link_libraries(paltest_sprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/test13.cpp index 7542bb6fa78..be0ba077bea 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/test13.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test13_paltest_sprintf_test13, "c_runtime/sprintf_s/test13/paltest_sprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/testinfo.dat deleted file mode 100644 index 9ec9a9f53d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests sprintf_s with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt deleted file mode 100644 index f85869a52bc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_sprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test14 coreclrpal) - -target_link_libraries(paltest_sprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/test14.cpp index 21b900d87d0..74c7b199f35 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/test14.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test14_paltest_sprintf_test14, "c_runtime/sprintf_s/test14/paltest_sprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/testinfo.dat deleted file mode 100644 index d9d2d7dd4eb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests sprintf_s with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt deleted file mode 100644 index 99bd4cf858a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_sprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test15 coreclrpal) - -target_link_libraries(paltest_sprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/test15.cpp index 17b4020ec0d..1854436ee80 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/test15.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test15_paltest_sprintf_test15, "c_runtime/sprintf_s/test15/paltest_sprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/testinfo.dat deleted file mode 100644 index 458ef784771..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests sprintf_s with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt deleted file mode 100644 index 1d57f8134f9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_sprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test16 coreclrpal) - -target_link_libraries(paltest_sprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/test16.cpp index b25a48633b4..b3cea7ebf16 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/test16.cpp @@ -19,7 +19,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test16_paltest_sprintf_test16, "c_runtime/sprintf_s/test16/paltest_sprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/testinfo.dat deleted file mode 100644 index a40e69e5310..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests sprintf_s with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt deleted file mode 100644 index 336639aef6f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_sprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test17 coreclrpal) - -target_link_libraries(paltest_sprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/test17.cpp index 1cf0aaa4f31..daa05ba7a0f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/test17.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test17_paltest_sprintf_test17, "c_runtime/sprintf_s/test17/paltest_sprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/testinfo.dat deleted file mode 100644 index 2782f03bb86..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests sprintf_s with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt deleted file mode 100644 index abf954908f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_sprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test18 coreclrpal) - -target_link_libraries(paltest_sprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/test18.cpp index e3130105f9c..abb9a0b7b70 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/test18.cpp @@ -19,7 +19,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test18_paltest_sprintf_test18, "c_runtime/sprintf_s/test18/paltest_sprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/testinfo.dat deleted file mode 100644 index e93e01f2b11..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests sprintf_s with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt deleted file mode 100644 index 79d22af70b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_sprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test19 coreclrpal) - -target_link_libraries(paltest_sprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/test19.cpp index 98be4e8e1ed..f5976c996e3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/test19.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test19_paltest_sprintf_test19, "c_runtime/sprintf_s/test19/paltest_sprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/testinfo.dat deleted file mode 100644 index ea56b0bb8f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests sprintf_s with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt deleted file mode 100644 index da08f52ca79..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_sprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test2 coreclrpal) - -target_link_libraries(paltest_sprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp index efa9e484a9c..56371a906e7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp @@ -19,7 +19,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test2_paltest_sprintf_test2, "c_runtime/sprintf_s/test2/paltest_sprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/testinfo.dat deleted file mode 100644 index 1ec448495ff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests sprintf_s with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt deleted file mode 100644 index 5a298edae22..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_sprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test3 coreclrpal) - -target_link_libraries(paltest_sprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp index f39d667386b..5f1ec06d4b3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test3_paltest_sprintf_test3, "c_runtime/sprintf_s/test3/paltest_sprintf_test3") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/testinfo.dat deleted file mode 100644 index cc56fe26478..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests sprintf_s with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt deleted file mode 100644 index ad306088e0b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_sprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test4 coreclrpal) - -target_link_libraries(paltest_sprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp index 67f664d59be..6d9f3ebe35f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp @@ -19,7 +19,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test4_paltest_sprintf_test4, "c_runtime/sprintf_s/test4/paltest_sprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/testinfo.dat deleted file mode 100644 index 617c9b2d3e5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests sprintf_s with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt deleted file mode 100644 index 631282956ce..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_sprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test6 coreclrpal) - -target_link_libraries(paltest_sprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/test6.cpp index 9682e61f543..a535777952e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/test6.cpp @@ -19,7 +19,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test6_paltest_sprintf_test6, "c_runtime/sprintf_s/test6/paltest_sprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/testinfo.dat deleted file mode 100644 index 8a8a3f4c986..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests sprintf_s with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt deleted file mode 100644 index c4261ef4cc4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_sprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test7 coreclrpal) - -target_link_libraries(paltest_sprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/test7.cpp index b9dc0a810d5..91d18837660 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/test7.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test7_paltest_sprintf_test7, "c_runtime/sprintf_s/test7/paltest_sprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/testinfo.dat deleted file mode 100644 index 38fa9371fe5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests sprintf_s with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt deleted file mode 100644 index dc12c5dae59..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_sprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test8 coreclrpal) - -target_link_libraries(paltest_sprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/test8.cpp index 70d0c6e1e09..1a5153c343d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/test8.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test8_paltest_sprintf_test8, "c_runtime/sprintf_s/test8/paltest_sprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/testinfo.dat deleted file mode 100644 index 8c9e8cff321..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests sprintf_s with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt deleted file mode 100644 index 28f2802953d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_sprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_sprintf_test9 coreclrpal) - -target_link_libraries(paltest_sprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/test9.cpp index d7e67a245b8..5804db818d4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/test9.cpp @@ -20,7 +20,7 @@ * Depends on memcmp and strlen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sprintf_s_test9_paltest_sprintf_test9, "c_runtime/sprintf_s/test9/paltest_sprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/testinfo.dat deleted file mode 100644 index beb708ae943..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sprintf_s -Name = Positive Test for sprintf_s -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests sprintf_s with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt deleted file mode 100644 index 2af8b93d08b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sqrt_test1 - ${SOURCES} -) - -add_dependencies(paltest_sqrt_test1 coreclrpal) - -target_link_libraries(paltest_sqrt_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp index ae1b92fd12e..c86c2cb29bb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp @@ -42,11 +42,11 @@ struct test }; /** - * validate + * sqrt_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl sqrt_test1_validate(double value, double expected, double variance) { double result = sqrt(value); @@ -64,11 +64,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * sqrt_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl sqrt_test1_validate_isnan(double value) { double result = sqrt(value); @@ -79,7 +79,7 @@ void __cdecl validate_isnan(double value) } } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sqrt_test1_paltest_sqrt_test1, "c_runtime/sqrt/test1/paltest_sqrt_test1") { struct test tests[] = { @@ -106,16 +106,16 @@ int __cdecl main(int argc, char **argv) return FAIL; } - validate(-0.0, -0.0, PAL_EPSILON); - validate( 0.0, 0.0, PAL_EPSILON); + sqrt_test1_validate(-0.0, -0.0, PAL_EPSILON); + sqrt_test1_validate( 0.0, 0.0, PAL_EPSILON); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); - validate_isnan(-tests[i].value); + sqrt_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); + sqrt_test1_validate_isnan(-tests[i].value); } - validate_isnan(PAL_NAN); + sqrt_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/testinfo.dat deleted file mode 100644 index 65001382b9a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrt/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sqrt -Name = Call sqrt on positive values and zero. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the sqrt function on a positive value, a positive value -= with a decimal and on the maxium possible double value. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt deleted file mode 100644 index 5790f709239..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_sqrtf_test1 - ${SOURCES} -) - -add_dependencies(paltest_sqrtf_test1 coreclrpal) - -target_link_libraries(paltest_sqrtf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/test1.cpp index ac3941b55f6..03cfffda1ee 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/test1.cpp @@ -41,11 +41,11 @@ struct test }; /** - * validate + * sqrtf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl sqrtf_test1_validate(float value, float expected, float variance) { float result = sqrtf(value); @@ -63,11 +63,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * sqrtf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl sqrtf_test1_validate_isnan(float value) { float result = sqrtf(value); @@ -78,7 +78,7 @@ void __cdecl validate_isnan(float value) } } -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_sqrtf_test1_paltest_sqrtf_test1, "c_runtime/sqrtf/test1/paltest_sqrtf_test1") { struct test tests[] = { @@ -105,16 +105,16 @@ int __cdecl main(int argc, char **argv) return FAIL; } - validate(-0.0f, -0.0f, PAL_EPSILON); - validate( 0.0f, 0.0f, PAL_EPSILON); + sqrtf_test1_validate(-0.0f, -0.0f, PAL_EPSILON); + sqrtf_test1_validate( 0.0f, 0.0f, PAL_EPSILON); for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate(tests[i].value, tests[i].expected, tests[i].variance); - validate_isnan(-tests[i].value); + sqrtf_test1_validate(tests[i].value, tests[i].expected, tests[i].variance); + sqrtf_test1_validate_isnan(-tests[i].value); } - validate_isnan(PAL_NAN); + sqrtf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/testinfo.dat deleted file mode 100644 index 1bda2dabe57..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sqrtf/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sqrtf -Name = Call sqrtf on positive values and zero. -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the sqrtf function on a positive value, a positive value -= with a decimal and on the maxium possible float value. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/CMakeLists.txt deleted file mode 100644 index 56b4848b303..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/sscanf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/sscanf_s.h index 6ef638c3fab..8c66c98fcb0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/sscanf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/sscanf_s.h @@ -13,7 +13,7 @@ #ifndef __SSCANF_S_H__ #define __SSCANF_S_H__ -void DoVoidTest(char *inputstr, const char *formatstr) +inline void DoVoidTest_scanf_s(char *inputstr, const char *formatstr) { char buf[256] = { 0 }; int i; @@ -36,8 +36,9 @@ void DoVoidTest(char *inputstr, const char *formatstr) } } +#define DoVoidTest DoVoidTest_scanf_s -void DoStrTest(char *inputstr, const char *formatstr, const char *checkstr) +inline void DoStrTest_scanf_s(char *inputstr, const char *formatstr, const char *checkstr) { char buf[256] = { 0 }; int ret; @@ -57,8 +58,9 @@ void DoStrTest(char *inputstr, const char *formatstr, const char *checkstr) } } +#define DoStrTest DoStrTest_scanf_s -void DoWStrTest(char *inputstr, const char *formatstr, const WCHAR *checkstr) +inline void DoWStrTest_scanf_s(char *inputstr, const char *formatstr, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; int ret; @@ -78,8 +80,9 @@ void DoWStrTest(char *inputstr, const char *formatstr, const WCHAR *checkstr) } } +#define DoWStrTest DoWStrTest_scanf_s -void DoNumTest(char *inputstr, const char *formatstr, int checknum) +inline void DoNumTest_scanf_s(char *inputstr, const char *formatstr, int checknum) { int num; int ret; @@ -97,8 +100,9 @@ void DoNumTest(char *inputstr, const char *formatstr, int checknum) "Expected %d, got %d.\n", inputstr, formatstr, checknum, num); } } +#define DoNumTest DoNumTest_scanf_s -void DoShortNumTest(char *inputstr, const char *formatstr, short checknum) +inline void DoShortNumTest_scanf_s(char *inputstr, const char *formatstr, short checknum) { short num; int ret; @@ -116,8 +120,9 @@ void DoShortNumTest(char *inputstr, const char *formatstr, short checknum) "Expected %hd, got %hd.\n", inputstr, formatstr, checknum, num); } } +#define DoShortNumTest DoShortNumTest_scanf_s -void DoI64NumTest(char *inputstr, const char *formatstr, INT64 checknum) +inline void DoI64NumTest_scanf_s(char *inputstr, const char *formatstr, INT64 checknum) { char buf[256]; char check[256]; @@ -139,8 +144,9 @@ void DoI64NumTest(char *inputstr, const char *formatstr, INT64 checknum) "Expected %s, got %s.\n", inputstr, formatstr, check, buf); } } +#define DoI64NumTest DoI64NumTest_scanf_s -void DoCharTest(char *inputstr, const char *formatstr, char* checkchars, int numchars) +inline void DoCharTest_scanf_s(char *inputstr, const char *formatstr, char* checkchars, int numchars) { char buf[256]; int ret; @@ -172,8 +178,9 @@ void DoCharTest(char *inputstr, const char *formatstr, char* checkchars, int num numchars); } } +#define DoCharTest DoCharTest_scanf_s -void DoWCharTest(char *inputstr, const char *formatstr, WCHAR* checkchars, int numchars) +inline void DoWCharTest_scanf_s(char *inputstr, const char *formatstr, WCHAR* checkchars, int numchars) { WCHAR buf[256]; int ret; @@ -205,9 +212,9 @@ void DoWCharTest(char *inputstr, const char *formatstr, WCHAR* checkchars, int n numchars); } } +#define DoWCharTest DoWCharTest_scanf_s - -void DoFloatTest(char *inputstr, const char *formatstr, float checkval) +inline void DoFloatTest_scanf_s(char *inputstr, const char *formatstr, float checkval) { char buf[256] = { 0 }; float val; @@ -240,6 +247,6 @@ void DoFloatTest(char *inputstr, const char *formatstr, float checkval) } } - +#define DoFloatTest DoFloatTest_scanf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt deleted file mode 100644 index 6069fc86a7b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sscanf_test1 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test1 coreclrpal) - -target_link_libraries(paltest_sscanf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/test1.cpp index c8c12aa854a..a359003e135 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/test1.cpp @@ -16,7 +16,7 @@ #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test1_paltest_sscanf_test1, "c_runtime/sscanf_s/test1/paltest_sscanf_test1") { int num; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/testinfo.dat deleted file mode 100644 index 03ccc14eb20..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test1 -Description -= General test of sscanf_s diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt deleted file mode 100644 index ba3dbad611d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_sscanf_test10 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test10 coreclrpal) - -target_link_libraries(paltest_sscanf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/test10.cpp index fb710429db1..caa94e49742 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/test10.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test10_paltest_sscanf_test10, "c_runtime/sscanf_s/test10/paltest_sscanf_test10") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/testinfo.dat deleted file mode 100644 index ef47b2b5ab7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests sscanf_s with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt deleted file mode 100644 index 69f212567b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_sscanf_test11 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test11 coreclrpal) - -target_link_libraries(paltest_sscanf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/test11.cpp index 665f006ee07..1561351ac1e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/test11.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test11_paltest_sscanf_test11, "c_runtime/sscanf_s/test11/paltest_sscanf_test11") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/testinfo.dat deleted file mode 100644 index 6dadb849e37..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests sscanf_s with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt deleted file mode 100644 index 21dbb424e29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_sscanf_test12 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test12 coreclrpal) - -target_link_libraries(paltest_sscanf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/test12.cpp index 912dac26f6d..337c8300083 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/test12.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test12_paltest_sscanf_test12, "c_runtime/sscanf_s/test12/paltest_sscanf_test12") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/testinfo.dat deleted file mode 100644 index 816f51ee671..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests sscanf_s with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt deleted file mode 100644 index 56a1adc73c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_sscanf_test13 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test13 coreclrpal) - -target_link_libraries(paltest_sscanf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/test13.cpp index f7deec83c78..0b7648a5173 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/test13.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test13_paltest_sscanf_test13, "c_runtime/sscanf_s/test13/paltest_sscanf_test13") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/testinfo.dat deleted file mode 100644 index 1e62e1a5c70..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests sscanf_s with floats (decimal notation) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt deleted file mode 100644 index 17cc710e79b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_sscanf_test14 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test14 coreclrpal) - -target_link_libraries(paltest_sscanf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/test14.cpp index 091afd61535..f3a975caff3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/test14.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test14_paltest_sscanf_test14, "c_runtime/sscanf_s/test14/paltest_sscanf_test14") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/testinfo.dat deleted file mode 100644 index cf144fe4627..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests sscanf_s with floats (exponential notation, lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt deleted file mode 100644 index d33cbb76d38..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_sscanf_test15 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test15 coreclrpal) - -target_link_libraries(paltest_sscanf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/test15.cpp index cf2a30de87b..1cd69a4c7bd 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/test15.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test15_paltest_sscanf_test15, "c_runtime/sscanf_s/test15/paltest_sscanf_test15") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/testinfo.dat deleted file mode 100644 index 1e7ac43310c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests sscanf_s with floats (exponential notation, uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt deleted file mode 100644 index fc8d924d169..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_sscanf_test16 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test16 coreclrpal) - -target_link_libraries(paltest_sscanf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/test16.cpp index 546d9fb6206..ff603f82eee 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/test16.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test16_paltest_sscanf_test16, "c_runtime/sscanf_s/test16/paltest_sscanf_test16") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/testinfo.dat deleted file mode 100644 index 6cc77ce7051..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests sscanf_s with floats (compact notation, lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt deleted file mode 100644 index 8f8f02fd77b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_sscanf_test17 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test17 coreclrpal) - -target_link_libraries(paltest_sscanf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/test17.cpp index 0205d4e4210..a9a4bd99d25 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/test17.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test17_paltest_sscanf_test17, "c_runtime/sscanf_s/test17/paltest_sscanf_test17") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/testinfo.dat deleted file mode 100644 index 555e5e31843..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests sscanf_s with floats (compact notation, uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt deleted file mode 100644 index 26b23fd358c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_sscanf_test2 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test2 coreclrpal) - -target_link_libraries(paltest_sscanf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/test2.cpp index 162521a8399..3579c4b8342 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/test2.cpp @@ -22,7 +22,7 @@ * feed), even if it says it only wants spaces tabs and newlines. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test2_paltest_sscanf_test2, "c_runtime/sscanf_s/test2/paltest_sscanf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/testinfo.dat deleted file mode 100644 index d3442af4136..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to see if sscanf_s handles whitespace correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt deleted file mode 100644 index 030b000e9d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_sscanf_test3 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test3 coreclrpal) - -target_link_libraries(paltest_sscanf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/test3.cpp index 85e6d8d0cbe..eb3b34a1098 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/test3.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test3_paltest_sscanf_test3, "c_runtime/sscanf_s/test3/paltest_sscanf_test3") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/testinfo.dat deleted file mode 100644 index 0125372264c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests sscanf_s with bracketed set strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt deleted file mode 100644 index a9fa199e48a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_sscanf_test4 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test4 coreclrpal) - -target_link_libraries(paltest_sscanf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/test4.cpp index 9caa663f5fb..a6348c982bc 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/test4.cpp @@ -16,7 +16,7 @@ #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test4_paltest_sscanf_test4, "c_runtime/sscanf_s/test4/paltest_sscanf_test4") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/testinfo.dat deleted file mode 100644 index 24436214cd3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests sscanf_s with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt deleted file mode 100644 index 70411683365..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_sscanf_test5 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test5 coreclrpal) - -target_link_libraries(paltest_sscanf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/test5.cpp index 35a4498f157..4679714df8a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/test5.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test5_paltest_sscanf_test5, "c_runtime/sscanf_s/test5/paltest_sscanf_test5") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/testinfo.dat deleted file mode 100644 index 54577ae93e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests sscanf_s with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt deleted file mode 100644 index 7c18d1375a9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_sscanf_test6 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test6 coreclrpal) - -target_link_libraries(paltest_sscanf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/test6.cpp index d0a75282e44..56e0e778f0e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/test6.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test6_paltest_sscanf_test6, "c_runtime/sscanf_s/test6/paltest_sscanf_test6") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/testinfo.dat deleted file mode 100644 index 7e33d024408..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests sscanf_s with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt deleted file mode 100644 index d80c1386ced..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_sscanf_test7 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test7 coreclrpal) - -target_link_libraries(paltest_sscanf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/test7.cpp index 609a29613c0..5be10dcc50d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/test7.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test7_paltest_sscanf_test7, "c_runtime/sscanf_s/test7/paltest_sscanf_test7") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/testinfo.dat deleted file mode 100644 index e2b55a7fd7a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests sscanf_s with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt deleted file mode 100644 index d9759d9a43c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_sscanf_test8 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test8 coreclrpal) - -target_link_libraries(paltest_sscanf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/test8.cpp index b447442a924..c5c0b9122d9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/test8.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test8_paltest_sscanf_test8, "c_runtime/sscanf_s/test8/paltest_sscanf_test8") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/testinfo.dat deleted file mode 100644 index d68933dd540..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests sscanf_s with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt deleted file mode 100644 index 37b4ad87d63..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_sscanf_test9 - ${SOURCES} -) - -add_dependencies(paltest_sscanf_test9 coreclrpal) - -target_link_libraries(paltest_sscanf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/test9.cpp index 0fcab98f024..0c53cf84d3d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/test9.cpp @@ -16,7 +16,7 @@ #include "../sscanf_s.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_sscanf_s_test9_paltest_sscanf_test9, "c_runtime/sscanf_s/test9/paltest_sscanf_test9") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/testinfo.dat deleted file mode 100644 index 371cd5e3128..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section =C Runtime -Function = sscanf_s -Name = Positive Test for sscanf_s -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests sscanf_s with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt deleted file mode 100644 index a08cb2b9054..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strcat_test1 - ${SOURCES} -) - -add_dependencies(paltest_strcat_test1 coreclrpal) - -target_link_libraries(paltest_strcat_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp index f5c00c5be44..7c8ec61fe9f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strcat_test1_paltest_strcat_test1, "c_runtime/strcat/test1/paltest_strcat_test1") { char dest[80]; char *test = "foo bar baz"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/testinfo.dat deleted file mode 100644 index 145816d7cb7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcat/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strcat -Name = Test #1 for strcat -TYPE = DEFAULT -EXE1 = test1 -Description -= Concatenate three strings into one string. Each time, check to ensure -= the pointer returned was what we expected. When finished, compare the -= newly formed string to what it should be to ensure no characters were -= lost. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt deleted file mode 100644 index a3e6cf8ed7c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strchr_test1 - ${SOURCES} -) - -add_dependencies(paltest_strchr_test1 coreclrpal) - -target_link_libraries(paltest_strchr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp index 0d75dd81dfb..44d0b6053c8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp @@ -25,7 +25,7 @@ struct testCase -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strchr_test1_paltest_strchr_test1, "c_runtime/strchr/test1/paltest_strchr_test1") { int i = 0; char *result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/testinfo.dat deleted file mode 100644 index 8c5f6a1214b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strchr/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strchr -Name = Test #1 for strchr -TYPE = DEFAULT -EXE1 = test1 -Description -= Test this on a character which is in a string, and ensure the pointer -= points to that character. Then check the string for the null character, -= which the return pointer should point to. Then search for a character not -= in the string and check that the return value is NULL. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt deleted file mode 100644 index 74d260cc62b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strcmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_strcmp_test1 coreclrpal) - -target_link_libraries(paltest_strcmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp index 26e00d939cf..dadbeb5cb5b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp @@ -21,24 +21,24 @@ typedef struct char string2[50]; } testCase; -testCase testCases[]= +PALTEST(c_runtime_strcmp_test1_paltest_strcmp_test1, "c_runtime/strcmp/test1/paltest_strcmp_test1") { - {0,"Hello","Hello"}, - {1,"hello","Hello"}, - {-1,"Hello","hello"}, - {0,"0Test","0Test"}, - {0,"***???","***???"}, - {0,"Testing the string for string comparison","Testing the string for " - "string comparison"}, - {-1,"Testing the string for string comparison","Testing the string for " - "string comparsioa"}, - {1,"Testing the string for string comparison","Testing the string for " - "comparison"}, - {-1,"aaaabbbbb","aabcdefeccg"} -}; + testCase testCases[]= + { + {0,"Hello","Hello"}, + {1,"hello","Hello"}, + {-1,"Hello","hello"}, + {0,"0Test","0Test"}, + {0,"***???","***???"}, + {0,"Testing the string for string comparison","Testing the string for " + "string comparison"}, + {-1,"Testing the string for string comparison","Testing the string for " + "string comparsioa"}, + {1,"Testing the string for string comparison","Testing the string for " + "comparison"}, + {-1,"aaaabbbbb","aabcdefeccg"} + }; -int __cdecl main(int argc, char *argv[]) -{ int i = 0; int result = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/testinfo.dat deleted file mode 100644 index ed6838e4205..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcmp/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strcmp -Name = Test #1 for strcmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Compare a number of different strings against each other, ensure that the -= three return values are given at the appropriate times. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt deleted file mode 100644 index 3fc0bfcd487..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strcpy_test1 - ${SOURCES} -) - -add_dependencies(paltest_strcpy_test1 coreclrpal) - -target_link_libraries(paltest_strcpy_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp index af9f88b1ede..969c360ac0f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strcpy_test1_paltest_strcpy_test1, "c_runtime/strcpy/test1/paltest_strcpy_test1") { char dest[80]; char *result = "foo"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/testinfo.dat deleted file mode 100644 index 2327a8ca83e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcpy/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strcpy -Name = Test #1 for strcpy -TYPE = DEFAULT -EXE1 = test1 -Description -= Call the function to copy into an empty buffer. Check that the return value -= is pointing at the destination buffer. Also compare the string copied to -= the origional string, to ensure they are the same. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt deleted file mode 100644 index f2fe19a0730..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strcspn_test1 - ${SOURCES} -) - -add_dependencies(paltest_strcspn_test1 coreclrpal) - -target_link_libraries(paltest_strcspn_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp index cd321f1e80e..2c7f7e609c1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase char *string2; }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strcspn_test1_paltest_strcspn_test1, "c_runtime/strcspn/test1/paltest_strcspn_test1") { int i=0; long TheResult = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/testinfo.dat deleted file mode 100644 index 54fbb7f3490..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strcspn/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strcspn -Name = Test #1 for strcspn -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests strcspn with a character set that should give an index into -=the middle of the original string. Also tests with character sets -=that are not in the string at all, and character sets that match -=with the very first character. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt deleted file mode 100644 index 4ecbbd2d201..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strlen_test1 - ${SOURCES} -) - -add_dependencies(paltest_strlen_test1 coreclrpal) - -target_link_libraries(paltest_strlen_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp index 9fea613f956..b19b3fec344 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strlen_test1_paltest_strlen_test1, "c_runtime/strlen/test1/paltest_strlen_test1") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/testinfo.dat deleted file mode 100644 index b55bc8e8a5b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strlen/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strlen -Name = Positive Test for strlen -TYPE = DEFAULT -EXE1 = test1 -Description -= Check the length of a string and the length of a 0 character string to -= see that this function returns the correct values for each. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt deleted file mode 100644 index 7221b15ae0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strncat_test1 - ${SOURCES} -) - -add_dependencies(paltest_strncat_test1 coreclrpal) - -target_link_libraries(paltest_strncat_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp index 505db1e6088..240a78f9fef 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strncat_test1_paltest_strncat_test1, "c_runtime/strncat/test1/paltest_strncat_test1") { char dest[80]; char *test = "foo barbaz"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/testinfo.dat deleted file mode 100644 index da8476d6649..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncat/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strncat -Name = Test #1 for strncat -TYPE = DEFAULT -EXE1 = test1 -Description -= Concatenate a few strings together, setting different lengths to be -= used for each one. Check to ensure the pointers which are returned are -= correct, and that the final string is what was expected. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt deleted file mode 100644 index 3787d50cfb8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strncmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_strncmp_test1 coreclrpal) - -target_link_libraries(paltest_strncmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp index 66d947edff9..c39498739f1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp @@ -23,29 +23,28 @@ typedef struct int number; } testCase; -testCase testCases[]= +PALTEST(c_runtime_strncmp_test1_paltest_strncmp_test1, "c_runtime/strncmp/test1/paltest_strncmp_test1") { - {0,"Hello","Hello",5}, - {1,"hello","Hello",3}, - {-1,"Hello","hello",5}, - {0,"heLLo","heLLo",5}, - {1,"hello","heLlo",5}, - {-1,"heLlo","hello",5}, - {0,"0Test","0Test",5}, - {0,"***???","***???",6}, - {0,"Testing the string for string comparison","Testing the string for " - "string comparison",40}, - {-1,"Testing the string for string comparison","Testing the string for " - "string comparsioa",40}, - {1,"Testing the string for string comparison","Testing the string for " - "comparison",34}, - {0,"aaaabbbbb","aabcdefeccg",2}, - {0,"abcd","abcd",10} -}; - + testCase testCases[]= + { + {0,"Hello","Hello",5}, + {1,"hello","Hello",3}, + {-1,"Hello","hello",5}, + {0,"heLLo","heLLo",5}, + {1,"hello","heLlo",5}, + {-1,"heLlo","hello",5}, + {0,"0Test","0Test",5}, + {0,"***???","***???",6}, + {0,"Testing the string for string comparison","Testing the string for " + "string comparison",40}, + {-1,"Testing the string for string comparison","Testing the string for " + "string comparsioa",40}, + {1,"Testing the string for string comparison","Testing the string for " + "comparison",34}, + {0,"aaaabbbbb","aabcdefeccg",2}, + {0,"abcd","abcd",10} + }; -int __cdecl main(int argc, char *argv[]) -{ int i=0; int iresult=0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/testinfo.dat deleted file mode 100644 index 0aabf93e4f8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncmp/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strncmp -Name = Test #1 for strncmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Test to ensure all three possible return values are given under the -= appropriate circumstance. Also, uses different sizes, to only compare -= portions of strings, checking to make sure these return the correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt deleted file mode 100644 index fac100451f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strncpy_test1 - ${SOURCES} -) - -add_dependencies(paltest_strncpy_test1 coreclrpal) - -target_link_libraries(paltest_strncpy_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp index 96f8f9b3bfe..b934d3cfb65 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strncpy_test1_paltest_strncpy_test1, "c_runtime/strncpy/test1/paltest_strncpy_test1") { char dest[80]; char *result = "foobar"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/testinfo.dat deleted file mode 100644 index eeb07877308..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strncpy/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strncpy -Name = Test #1 for strncpy -TYPE = DEFAULT -EXE1 = test1 -Description -= Test to see that you can copy a portion of a string into a new buffer. -= Also check that the strncpy function doesn't overflow when it is used. -= Finally check that if the number of characters given is greater than the -= amount to copy, that the destination buffer is padded with NULLs. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt deleted file mode 100644 index 6748bea9472..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strpbrk_test1 - ${SOURCES} -) - -add_dependencies(paltest_strpbrk_test1 coreclrpal) - -target_link_libraries(paltest_strpbrk_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp index 88bb3da1e13..b2b90edea7e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase char *string2; }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strpbrk_test1_paltest_strpbrk_test1, "c_runtime/strpbrk/test1/paltest_strpbrk_test1") { char *ptr = NULL; int i = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/testinfo.dat deleted file mode 100644 index 291f23458d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strpbrk/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strpbrk -Name = Test #1 for strpbrk -TYPE = DEFAULT -EXE1 = test1 -Description -= Search a string for characters in a given character set and ensure the -= pointer returned points to the first occurrence. Check to see that the -= function returns NULL if the character is not found. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt deleted file mode 100644 index 25e8916030b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strrchr_test1 - ${SOURCES} -) - -add_dependencies(paltest_strrchr_test1 coreclrpal) - -target_link_libraries(paltest_strrchr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp index b7014848d9f..85e53eb2a86 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strrchr_test1_paltest_strrchr_test1, "c_runtime/strrchr/test1/paltest_strrchr_test1") { char *str = "foo bar baz"; char *ptr; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/testinfo.dat deleted file mode 100644 index 8c35087963b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strrchr/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strrchr -Name = Test #1 for strrchr -TYPE = DEFAULT -EXE1 = test1 -Description -= Search a string for a given character. Search for a character contained -= in the string, and ensure the pointer returned points to it. Then search -= for the null character, and ensure the pointer points to that. Finally -= search for a character which is not in the string and ensure that it -= returns NULL. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt deleted file mode 100644 index e984a6e578f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strspn_test1 - ${SOURCES} -) - -add_dependencies(paltest_strspn_test1 coreclrpal) - -target_link_libraries(paltest_strspn_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp index cc841696284..64bac75258e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp @@ -23,7 +23,7 @@ struct testCase char *string2; }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strspn_test1_paltest_strspn_test1, "c_runtime/strspn/test1/paltest_strspn_test1") { int i=0; long TheResult = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/testinfo.dat deleted file mode 100644 index a5c17886711..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strspn/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strspn -Name = Test #1 for strspn -TYPE = DEFAULT -EXE1 = test1 -Description -= Check a character set against a string to see that the function returns -= the length of the substring which consists of all characters in the string. -= Also check that if the character set doesn't match the string at all, that -= the value is 0. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt deleted file mode 100644 index 4efe7105b4e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strstr_test1 - ${SOURCES} -) - -add_dependencies(paltest_strstr_test1 coreclrpal) - -target_link_libraries(paltest_strstr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp index cfd71ac57fb..e50d5bda12b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp @@ -28,7 +28,7 @@ struct testCase }; -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strstr_test1_paltest_strstr_test1, "c_runtime/strstr/test1/paltest_strstr_test1") { int i=0; char *ptr=NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/testinfo.dat deleted file mode 100644 index 45bdf71da1f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strstr/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strstr -Name = Positive Test for strstr -TYPE = DEFAULT -EXE1 = test1 -Description -= Check three cases of searching for a string within a string. First when -= the string is contained, check that the pointer returned points to it. -= Then when it isn't contained, ensure it returns null. And when the string -= we're searching for is empty, it should return a pointer to the string -= we're searching through. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt deleted file mode 100644 index 8914dd1e17d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strtod_test1 - ${SOURCES} -) - -add_dependencies(paltest_strtod_test1 coreclrpal) - -target_link_libraries(paltest_strtod_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp index e4d7d66623f..d5b6d0a66f6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp @@ -23,7 +23,7 @@ struct testCase }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_strtod_test1_paltest_strtod_test1, "c_runtime/strtod/test1/paltest_strtod_test1") { char * endptr; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/testinfo.dat deleted file mode 100644 index a5141e07a34..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strtod -Name = Positive Test for strtod -TYPE = DEFAULT -EXE1 = test1 -Description -= Purpose: Tests the PAL implementation of the strtod function. -= Convert a number of strings to doubles. Ensure they convert correctly. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt deleted file mode 100644 index aabfd182931..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_strtod_test2 - ${SOURCES} -) - -add_dependencies(paltest_strtod_test2 coreclrpal) - -target_link_libraries(paltest_strtod_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp index 71915dbbd5c..038bbe07a1a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_strtod_test2_paltest_strtod_test2, "c_runtime/strtod/test2/paltest_strtod_test2") { /* Representation of positive infinty for a IEEE 64-bit double */ INT64 PosInifity = (INT64)(0x7ff00000) << 32; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/testinfo.dat deleted file mode 100644 index 892df776dfc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtod/test2/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strtod -Name = Negative test for strtod with overflows -TYPE = DEFAULT -EXE1 = test2 -Description -= Test strtod with overflows. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt deleted file mode 100644 index 322203c4827..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strtok_test1 - ${SOURCES} -) - -add_dependencies(paltest_strtok_test1 coreclrpal) - -target_link_libraries(paltest_strtok_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp index de157a531db..b14222931ad 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_strtok_test1_paltest_strtok_test1, "c_runtime/strtok/test1/paltest_strtok_test1") { char str[] = "foo bar baz"; char *result1= "foo \0ar baz"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/testinfo.dat deleted file mode 100644 index 78c82d75a07..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtok/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strtok -Name = Test #1 for strtok -TYPE = DEFAULT -EXE1 = test1 -Description -= Search for a number of tokens within strings. Check that the return values -= are what is expect, and also that the strings match up with our expected -= results. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt deleted file mode 100644 index 4d58d74b140..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_strtoul_test1 - ${SOURCES} -) - -add_dependencies(paltest_strtoul_test1 coreclrpal) - -target_link_libraries(paltest_strtoul_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp index 4db4401a5ec..c18b550d1e1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp @@ -27,20 +27,19 @@ typedef struct ULONG result; } TestCase; -TestCase TestCases[] = +PALTEST(c_runtime_strtoul_test1_paltest_strtoul_test1, "c_runtime/strtoul/test1/paltest_strtoul_test1") { - { teststr1, teststr1 + 3, 4, 27}, - { teststr1, teststr1 + 5, 10, 12345}, - { teststr2, teststr2, 10, 0}, - { teststr3, teststr3+10, 10, 4294967295ul}, - { teststr4, teststr4+10, 10, 4294967295ul} -}; - -int NumCases = sizeof(TestCases) / sizeof(TestCases[0]); + TestCase TestCases[] = + { + { teststr1, teststr1 + 3, 4, 27}, + { teststr1, teststr1 + 5, 10, 12345}, + { teststr2, teststr2, 10, 0}, + { teststr3, teststr3+10, 10, 4294967295ul}, + { teststr4, teststr4+10, 10, 4294967295ul} + }; + int NumCases = sizeof(TestCases) / sizeof(TestCases[0]); -int __cdecl main(int argc, char *argv[]) -{ char *end; ULONG l; int i; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/testinfo.dat deleted file mode 100644 index df7165719db..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/strtoul/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = strtoul -Name = Test #1 for strtoul -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests stroul with different bases and overflows, as well as valid input. -= Makes sure that the end pointer is correct. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h index 74ab02977ae..5ca39606e8b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h @@ -13,7 +13,7 @@ #ifndef __SWPRINTF_H__ #define __SWPRINTF_H__ -void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) +inline void DoWStrTest_swprintf_s(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -27,8 +27,9 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoWStrTest DoWStrTest_swprintf_s -void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) +inline void DoStrTest_swprintf_s(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -42,8 +43,9 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) convertC(buf)); } } +#define DoStrTest DoStrTest_swprintf_s -void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) +inline void DoPointerTest_swprintf_s(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) { WCHAR buf[256] = { 0 }; @@ -55,8 +57,9 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) convertC(formatstr), convertC(checkstr1), convertC(buf)); } } +#define DoPointerTest DoPointerTest_swprintf_s -void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) +inline void DoCharTest_swprintf_s(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -68,8 +71,9 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoCharTest DoCharTest_swprintf_s -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoWCharTest_swprintf_s(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -81,8 +85,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) convertC(formatstr), convertC(checkstr), convertC(buf)); } } +#define DoWCharTest DoWCharTest_swprintf_s -void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) +inline void DoNumTest_swprintf_s(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -94,8 +99,9 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoNumTest DoNumTest_swprintf_s -void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc, +inline void DoI64Test_swprintf_s(const WCHAR *formatstr, INT64 param, char *paramdesc, const WCHAR *checkstr1) { WCHAR buf[256] = { 0 }; @@ -108,8 +114,9 @@ void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc, convertC(formatstr), convertC(checkstr1), convertC(buf)); } } +#define DoI64Test DoI64Test_swprintf_s -void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, +inline void DoDoubleTest_swprintf_s(const WCHAR *formatstr, double value, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256] = { 0 }; @@ -124,8 +131,9 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, convertC(checkstr2), convertC(buf)); } } +#define DoDoubleTest DoDoubleTest_swprintf_s -void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_swprintf_s(const WCHAR *formatstr, int precision, void *param, char *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256]; @@ -140,8 +148,9 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, convertC(checkstr1), convertC(checkstr2), convertC(buf)); } } +#define DoArgumentPrecTest DoArgumentPrecTest_swprintf_s -void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_swprintf_s(const WCHAR *formatstr, int precision, double param, const WCHAR *checkstr1, const WCHAR *checkstr2) { WCHAR buf[256]; @@ -156,6 +165,7 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para convertC(checkstr1), convertC(checkstr2), convertC(buf)); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_swprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt deleted file mode 100644 index 6427bdbd989..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_swprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test1 coreclrpal) - -target_link_libraries(paltest_swprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp index 7353646b31b..62ec881dfca 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test1_paltest_swprintf_test1, "c_runtime/swprintf/test1/paltest_swprintf_test1") { WCHAR *checkstr; WCHAR buf[256]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/testinfo.dat deleted file mode 100644 index e8044652841..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if swprintf works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt deleted file mode 100644 index 23190da6ce1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_swprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test10 coreclrpal) - -target_link_libraries(paltest_swprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp index aaf472c0e90..0231e7b6e9b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test10_paltest_swprintf_test10, "c_runtime/swprintf/test10/paltest_swprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/testinfo.dat deleted file mode 100644 index 7f8ec90c67b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests swprintf with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt deleted file mode 100644 index f18db331198..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_swprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test11 coreclrpal) - -target_link_libraries(paltest_swprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp index 63592c542bf..10b442fc39a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test11_paltest_swprintf_test11, "c_runtime/swprintf/test11/paltest_swprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/testinfo.dat deleted file mode 100644 index 54b90d78845..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests swprintf with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt deleted file mode 100644 index 23d4177c998..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_swprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test12 coreclrpal) - -target_link_libraries(paltest_swprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp index d3789b5f706..4c755c7f808 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test12_paltest_swprintf_test12, "c_runtime/swprintf/test12/paltest_swprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/testinfo.dat deleted file mode 100644 index 91439b8928c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests swprintf with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt deleted file mode 100644 index 828270fd98d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_swprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test13 coreclrpal) - -target_link_libraries(paltest_swprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp index d404eb95d2b..7cd455f8cac 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test13_paltest_swprintf_test13, "c_runtime/swprintf/test13/paltest_swprintf_test13") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/testinfo.dat deleted file mode 100644 index d22b3a6175e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests swprintf with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt deleted file mode 100644 index a3caec6c10c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_swprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test14 coreclrpal) - -target_link_libraries(paltest_swprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp index f17e42e0cc0..22fd903faa3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test14_paltest_swprintf_test14, "c_runtime/swprintf/test14/paltest_swprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/testinfo.dat deleted file mode 100644 index 9b069ec8994..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests swprintf with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt deleted file mode 100644 index 62cdc8daeb9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_swprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test15 coreclrpal) - -target_link_libraries(paltest_swprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp index 2aab51237fa..0aa939d70a6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test15_paltest_swprintf_test15, "c_runtime/swprintf/test15/paltest_swprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/testinfo.dat deleted file mode 100644 index 3f917fc4054..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests swprintf with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt deleted file mode 100644 index 19773af4381..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_swprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test16 coreclrpal) - -target_link_libraries(paltest_swprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp index a97e5166956..2edce8b2b51 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test16_paltest_swprintf_test16, "c_runtime/swprintf/test16/paltest_swprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/testinfo.dat deleted file mode 100644 index 0047513d65e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests swprintf with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt deleted file mode 100644 index 745cebcc15d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_swprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test17 coreclrpal) - -target_link_libraries(paltest_swprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp index b6c0aef6e51..5fc26e57ff2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test17_paltest_swprintf_test17, "c_runtime/swprintf/test17/paltest_swprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/testinfo.dat deleted file mode 100644 index ba8b0542bec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests swprintf with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt deleted file mode 100644 index d2257435b64..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_swprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test18 coreclrpal) - -target_link_libraries(paltest_swprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp index fd51bb0a4a6..717ca688b82 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test18_paltest_swprintf_test18, "c_runtime/swprintf/test18/paltest_swprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/testinfo.dat deleted file mode 100644 index 5aa2c3436f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests swprintf with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt deleted file mode 100644 index 0e125d70527..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_swprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test19 coreclrpal) - -target_link_libraries(paltest_swprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp index 936a4ef6f8e..43a38d74774 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test19_paltest_swprintf_test19, "c_runtime/swprintf/test19/paltest_swprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/testinfo.dat deleted file mode 100644 index 83c17566a57..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests swprintf with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt deleted file mode 100644 index cd04e49dc6d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_swprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test2 coreclrpal) - -target_link_libraries(paltest_swprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp index e2721b0a177..e6eee392eb4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test2_paltest_swprintf_test2, "c_runtime/swprintf/test2/paltest_swprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/testinfo.dat deleted file mode 100644 index cf9413bb2bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests swprintf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt deleted file mode 100644 index 47ee916d275..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_swprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test3 coreclrpal) - -target_link_libraries(paltest_swprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp index fd8a82af34d..16b37c8da33 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test3_paltest_swprintf_test3, "c_runtime/swprintf/test3/paltest_swprintf_test3") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/testinfo.dat deleted file mode 100644 index d8b74f0a083..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests swprintf with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt deleted file mode 100644 index d33c2d22d7e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_swprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test4 coreclrpal) - -target_link_libraries(paltest_swprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp index c461fab0ab2..ce5a2b24939 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test4_paltest_swprintf_test4, "c_runtime/swprintf/test4/paltest_swprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/testinfo.dat deleted file mode 100644 index 68d4d11fb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests swprintf with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt deleted file mode 100644 index 2ff88fced24..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_swprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test6 coreclrpal) - -target_link_libraries(paltest_swprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp index 9fe4f14af50..2e2465c942f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test6_paltest_swprintf_test6, "c_runtime/swprintf/test6/paltest_swprintf_test6") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/testinfo.dat deleted file mode 100644 index 4b30cd1c61a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests swprintf with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt deleted file mode 100644 index 28454845eb1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_swprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test7 coreclrpal) - -target_link_libraries(paltest_swprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp index f547877e464..ff9133197c6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp @@ -20,7 +20,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test7_paltest_swprintf_test7, "c_runtime/swprintf/test7/paltest_swprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/testinfo.dat deleted file mode 100644 index ab8f20d1628..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests swprintf with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt deleted file mode 100644 index 72c922ca0e6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_swprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test8 coreclrpal) - -target_link_libraries(paltest_swprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp index e861c92cb4f..2ad8b05de66 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test8_paltest_swprintf_test8, "c_runtime/swprintf/test8/paltest_swprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/testinfo.dat deleted file mode 100644 index 1626ffd8959..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests swprintf with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt deleted file mode 100644 index 7236065bd0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_swprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test9 coreclrpal) - -target_link_libraries(paltest_swprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp index e49e788df04..970f3d70269 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp @@ -19,7 +19,7 @@ * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swprintf_test9_paltest_swprintf_test9, "c_runtime/swprintf/test9/paltest_swprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/testinfo.dat deleted file mode 100644 index 2c3207e0f33..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swprintf/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests swprintf with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/CMakeLists.txt deleted file mode 100644 index 56b4848b303..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h index 20c99092e1a..a5b0228bc01 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h @@ -13,7 +13,7 @@ #ifndef __SWSCANF_H__ #define __SWSCANF_H__ -void DoVoidTest(WCHAR *inputstr, const WCHAR *formatstr) +inline void DoVoidTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr) { char buf[256] = { 0 }; int i; @@ -38,8 +38,9 @@ void DoVoidTest(WCHAR *inputstr, const WCHAR *formatstr) } } +#define DoVoidTest DoVoidTest_swscanf -void DoStrTest(WCHAR *inputstr, const WCHAR *formatstr, const char *checkstr) +inline void DoStrTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, const char *checkstr) { char buf[256] = { 0 }; int ret; @@ -61,8 +62,9 @@ void DoStrTest(WCHAR *inputstr, const WCHAR *formatstr, const char *checkstr) } } +#define DoStrTest DoStrTest_swscanf -void DoWStrTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkstr) +inline void DoWStrTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; int ret; @@ -84,8 +86,9 @@ void DoWStrTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkstr) } } +#define DoWStrTest DoWStrTest_swscanf -void DoNumTest(WCHAR *inputstr, const WCHAR *formatstr, int checknum) +inline void DoNumTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, int checknum) { int num = 0; int ret; @@ -105,8 +108,9 @@ void DoNumTest(WCHAR *inputstr, const WCHAR *formatstr, int checknum) convertC(formatstr), checknum, num); } } +#define DoNumTest DoNumTest_swscanf -void DoShortNumTest(WCHAR *inputstr, const WCHAR *formatstr, short checknum) +inline void DoShortNumTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, short checknum) { short num = 0; int ret; @@ -126,8 +130,9 @@ void DoShortNumTest(WCHAR *inputstr, const WCHAR *formatstr, short checknum) convertC(formatstr), checknum, num); } } +#define DoShortNumTest DoShortNumTest_swscanf -void DoI64NumTest(WCHAR *inputstr, const WCHAR *formatstr, INT64 checknum) +inline void DoI64NumTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, INT64 checknum) { char buf[256]; char check[256]; @@ -151,8 +156,9 @@ void DoI64NumTest(WCHAR *inputstr, const WCHAR *formatstr, INT64 checknum) convertC(formatstr), check, buf); } } +#define DoI64NumTest DoI64NumTest_swscanf -void DoCharTest(WCHAR *inputstr, const WCHAR *formatstr, char* checkchars, int numchars) +inline void DoCharTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, char* checkchars, int numchars) { char buf[256]; int ret; @@ -185,8 +191,9 @@ void DoCharTest(WCHAR *inputstr, const WCHAR *formatstr, char* checkchars, int n convertC(inputstr), convertC(formatstr), numchars); } } +#define DoCharTest DoCharTest_swscanf -void DoWCharTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkchars, int numchars) +inline void DoWCharTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkchars, int numchars) { WCHAR buf[256]; int ret; @@ -220,9 +227,9 @@ void DoWCharTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkchar convertC(inputstr), convertC(formatstr), numchars); } } +#define DoWCharTest DoWCharTest_swscanf - -void DoFloatTest(WCHAR *inputstr, const WCHAR *formatstr, float checkval) +inline void DoFloatTest_swscanf(WCHAR *inputstr, const WCHAR *formatstr, float checkval) { char buf[256] = { 0 }; float val; @@ -256,6 +263,6 @@ void DoFloatTest(WCHAR *inputstr, const WCHAR *formatstr, float checkval) } } - +#define DoFloatTest DoFloatTest_swscanf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt deleted file mode 100644 index ce24b1ea3fd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_swscanf_test1 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test1 coreclrpal) - -target_link_libraries(paltest_swscanf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp index 790284a0174..257706ae4cd 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test1_paltest_swscanf_test1, "c_runtime/swscanf/test1/paltest_swscanf_test1") { int num; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/testinfo.dat deleted file mode 100644 index 607f2641d62..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test of swscanf diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt deleted file mode 100644 index f250da5a9c4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_swscanf_test10 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test10 coreclrpal) - -target_link_libraries(paltest_swscanf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp index 0c7c6cbd755..0e9422950bd 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test10_paltest_swscanf_test10, "c_runtime/swscanf/test10/paltest_swscanf_test10") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/testinfo.dat deleted file mode 100644 index 45ed1aea593..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests swscanf with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt deleted file mode 100644 index c5fed9e9e8f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_swscanf_test11 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test11 coreclrpal) - -target_link_libraries(paltest_swscanf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp index a5044d82c43..e24ca297f49 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test11_paltest_swscanf_test11, "c_runtime/swscanf/test11/paltest_swscanf_test11") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/testinfo.dat deleted file mode 100644 index 03ac4b1eab3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests swscanf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt deleted file mode 100644 index 33e2949f70a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_swscanf_test12 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test12 coreclrpal) - -target_link_libraries(paltest_swscanf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp index 2ab7d910409..857c1386f9f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test12_paltest_swscanf_test12, "c_runtime/swscanf/test12/paltest_swscanf_test12") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/testinfo.dat deleted file mode 100644 index a5ce40ced2c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests swscanf with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt deleted file mode 100644 index 5dc8b64984f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_swscanf_test13 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test13 coreclrpal) - -target_link_libraries(paltest_swscanf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp index 2c89bcaaf40..1e4d6021eb7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test13_paltest_swscanf_test13, "c_runtime/swscanf/test13/paltest_swscanf_test13") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/testinfo.dat deleted file mode 100644 index 92c9888305f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests swscanf with floats (decimal notation) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt deleted file mode 100644 index ca377515ece..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_swscanf_test14 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test14 coreclrpal) - -target_link_libraries(paltest_swscanf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp index a21976c0937..a8cfc904017 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test14_paltest_swscanf_test14, "c_runtime/swscanf/test14/paltest_swscanf_test14") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/testinfo.dat deleted file mode 100644 index 0a95899ad8b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests swscanf with floats (exponential notation, lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt deleted file mode 100644 index 4b56b9a76ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_swscanf_test15 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test15 coreclrpal) - -target_link_libraries(paltest_swscanf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp index ef50e91905f..73a4e536ca4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test15_paltest_swscanf_test15, "c_runtime/swscanf/test15/paltest_swscanf_test15") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/testinfo.dat deleted file mode 100644 index b022abba568..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests swscanf with floats (exponential notation, uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt deleted file mode 100644 index 6004b38e67c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_swscanf_test16 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test16 coreclrpal) - -target_link_libraries(paltest_swscanf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp index 1a21fa91538..aff2ce3e0e5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test16_paltest_swscanf_test16, "c_runtime/swscanf/test16/paltest_swscanf_test16") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/testinfo.dat deleted file mode 100644 index 186db5ba433..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests swscanf with floats (compact notation, lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt deleted file mode 100644 index 70226c27485..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_swscanf_test17 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test17 coreclrpal) - -target_link_libraries(paltest_swscanf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp index ffa8b9e2dde..e50bf8a924f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test17_paltest_swscanf_test17, "c_runtime/swscanf/test17/paltest_swscanf_test17") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/testinfo.dat deleted file mode 100644 index 6b393940feb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests swscanf with floats (compact notation, uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt deleted file mode 100644 index 42c2d6ce275..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_swscanf_test2 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test2 coreclrpal) - -target_link_libraries(paltest_swscanf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp index 3263341f715..2661d0205da 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp @@ -21,7 +21,7 @@ * feed), even if it says it only wants spaces tabs and newlines. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test2_paltest_swscanf_test2, "c_runtime/swscanf/test2/paltest_swscanf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/testinfo.dat deleted file mode 100644 index 188db373680..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to see if swscanf handles whitespace correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt deleted file mode 100644 index 3777c35d0a1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_swscanf_test3 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test3 coreclrpal) - -target_link_libraries(paltest_swscanf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp index 0413f150276..f1fc330fc2e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test3_paltest_swscanf_test3, "c_runtime/swscanf/test3/paltest_swscanf_test3") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/testinfo.dat deleted file mode 100644 index c84dda67d8d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests swscanf with bracketed set strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt deleted file mode 100644 index e17b9beb342..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_swscanf_test4 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test4 coreclrpal) - -target_link_libraries(paltest_swscanf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp index 11f86c4f621..be65035d4b7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test4_paltest_swscanf_test4, "c_runtime/swscanf/test4/paltest_swscanf_test4") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/testinfo.dat deleted file mode 100644 index 84639a1c25c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests swscanf with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt deleted file mode 100644 index 736ce1135cc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_swscanf_test5 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test5 coreclrpal) - -target_link_libraries(paltest_swscanf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp index 8b8be9a318a..396c862fef1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test5_paltest_swscanf_test5, "c_runtime/swscanf/test5/paltest_swscanf_test5") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/testinfo.dat deleted file mode 100644 index ffe131d1788..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests swscanf with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt deleted file mode 100644 index 48c2750676b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_swscanf_test6 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test6 coreclrpal) - -target_link_libraries(paltest_swscanf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp index d1a2540ca8a..8cf2063f017 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test6_paltest_swscanf_test6, "c_runtime/swscanf/test6/paltest_swscanf_test6") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/testinfo.dat deleted file mode 100644 index d4969b1ba08..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests swscanf with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt deleted file mode 100644 index 4453e248993..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_swscanf_test7 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test7 coreclrpal) - -target_link_libraries(paltest_swscanf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp index 954c1820b02..404eeecf13c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test7_paltest_swscanf_test7, "c_runtime/swscanf/test7/paltest_swscanf_test7") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/testinfo.dat deleted file mode 100644 index fa3d1fc1145..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests swscanf with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt deleted file mode 100644 index 8d4e51b77ef..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_swscanf_test8 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test8 coreclrpal) - -target_link_libraries(paltest_swscanf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp index 9f02ac9efb3..9c54283c09f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp @@ -16,7 +16,7 @@ #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test8_paltest_swscanf_test8, "c_runtime/swscanf/test8/paltest_swscanf_test8") { int n65535 = 65535; /* Walkaround compiler strictness */ diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/testinfo.dat deleted file mode 100644 index 2363091e712..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests swscanf with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt deleted file mode 100644 index 4b5e4c5fcb2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_swscanf_test9 - ${SOURCES} -) - -add_dependencies(paltest_swscanf_test9 coreclrpal) - -target_link_libraries(paltest_swscanf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp index 0d7cd508816..c6cab41fe26 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> #include "../swscanf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_swscanf_test9_paltest_swscanf_test9, "c_runtime/swscanf/test9/paltest_swscanf_test9") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/testinfo.dat deleted file mode 100644 index 9e3006447a5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/swscanf/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = swscanf -Name = Positive Test for swscanf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests swscanf with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt deleted file mode 100644 index c7bffa5dda5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_tan_test1 - ${SOURCES} -) - -add_dependencies(paltest_tan_test1 coreclrpal) - -target_link_libraries(paltest_tan_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp index 4724f0567c8..11f9123354e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * tan_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl tan_test1_validate(double value, double expected, double variance) { double result = tan(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * tan_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl tan_test1_validate_isnan(double value) { double result = tan(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_tan_test1_paltest_tan_test1, "c_runtime/tan/test1/paltest_tan_test1") { struct test tests[] = { @@ -117,19 +117,19 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + tan_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + tan_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } // -- SPECIAL CASE -- // Normally, tan(pi / 2) would return PAL_POSINF (atan2(PAL_POSINF) does return (pi / 2)). // However, it seems instead (on all supported systems), we get a different number entirely. - validate( 1.5707963267948966, 16331239353195370.0, 0); - validate(-1.5707963267948966, -16331239353195370.0, 0); + tan_test1_validate( 1.5707963267948966, 16331239353195370.0, 0); + tan_test1_validate(-1.5707963267948966, -16331239353195370.0, 0); - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + tan_test1_validate_isnan(PAL_NEGINF); + tan_test1_validate_isnan(PAL_NAN); + tan_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/testinfo.dat deleted file mode 100644 index 61ce69e24f3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tan/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = tan -Name = Positive Test for tan -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to tan() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt deleted file mode 100644 index e6a4ee55af1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_tanf_test1 - ${SOURCES} -) - -add_dependencies(paltest_tanf_test1 coreclrpal) - -target_link_libraries(paltest_tanf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/test1.cpp index 7fb8b859e82..2f7358cc277 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * tanf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl tanf_test1_validate(float value, float expected, float variance) { float result = tanf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * tanf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl tanf_test1_validate_isnan(float value) { float result = tanf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_tanf_test1_paltest_tanf_test1, "c_runtime/tanf/test1/paltest_tanf_test1") { struct test tests[] = { @@ -116,19 +116,19 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + tanf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + tanf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } // -- SPECIAL CASE -- // Normally, tanf(pi / 2) would return PAL_POSINF (atan2f(PAL_POSINF) does return (pi / 2)). // However, it seems instead (on all supported systems), we get a different number entirely. - validate( 1.57079633f, -22877332.0, PAL_EPSILON * 100000000); - validate(-1.57079633f, 22877332.0, PAL_EPSILON * 100000000); + tanf_test1_validate( 1.57079633f, -22877332.0, PAL_EPSILON * 100000000); + tanf_test1_validate(-1.57079633f, 22877332.0, PAL_EPSILON * 100000000); - validate_isnan(PAL_NEGINF); - validate_isnan(PAL_NAN); - validate_isnan(PAL_POSINF); + tanf_test1_validate_isnan(PAL_NEGINF); + tanf_test1_validate_isnan(PAL_NAN); + tanf_test1_validate_isnan(PAL_POSINF); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/testinfo.dat deleted file mode 100644 index d0b661feb42..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = tanf -Name = Positive Test for tanf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to tanf() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt deleted file mode 100644 index ee8f76a2562..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_tanh_test1 - ${SOURCES} -) - -add_dependencies(paltest_tanh_test1 coreclrpal) - -target_link_libraries(paltest_tanh_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp index 5c6102478af..a2df3885803 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp @@ -45,11 +45,11 @@ struct test }; /** - * validate + * tanh_test1_validate * * test validation function */ -void __cdecl validate(double value, double expected, double variance) +void __cdecl tanh_test1_validate(double value, double expected, double variance) { double result = tanh(value); @@ -67,11 +67,11 @@ void __cdecl validate(double value, double expected, double variance) } /** - * validate + * tanh_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(double value) +void __cdecl tanh_test1_validate_isnan(double value) { double result = tanh(value); @@ -87,7 +87,7 @@ void __cdecl validate_isnan(double value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_tanh_test1_paltest_tanh_test1, "c_runtime/tanh/test1/paltest_tanh_test1") { struct test tests[] = { @@ -118,11 +118,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + tanh_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + tanh_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + tanh_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/testinfo.dat deleted file mode 100644 index 4bd3bfcd842..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanh/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = tanh -Name = Positive Test for tanh -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to tanh() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt deleted file mode 100644 index 5ee8f067682..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.c -) - -add_executable(paltest_tanhf_test1 - ${SOURCES} -) - -add_dependencies(paltest_tanhf_test1 coreclrpal) - -target_link_libraries(paltest_tanhf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/test1.c b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/test1.cpp index 01649aea593..646e743fa41 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/test1.c +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/test1.cpp @@ -44,11 +44,11 @@ struct test }; /** - * validate + * tanhf_test1_validate * * test validation function */ -void __cdecl validate(float value, float expected, float variance) +void __cdecl tanhf_test1_validate(float value, float expected, float variance) { float result = tanhf(value); @@ -66,11 +66,11 @@ void __cdecl validate(float value, float expected, float variance) } /** - * validate + * tanhf_test1_validate * * test validation function for values returning NaN */ -void __cdecl validate_isnan(float value) +void __cdecl tanhf_test1_validate_isnan(float value) { float result = tanhf(value); @@ -86,7 +86,7 @@ void __cdecl validate_isnan(float value) * * executable entry point */ -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_tanhf_test1_paltest_tanhf_test1, "c_runtime/tanhf/test1/paltest_tanhf_test1") { struct test tests[] = { @@ -117,11 +117,11 @@ int __cdecl main(int argc, char **argv) for (int i = 0; i < (sizeof(tests) / sizeof(struct test)); i++) { - validate( tests[i].value, tests[i].expected, tests[i].variance); - validate(-tests[i].value, -tests[i].expected, tests[i].variance); + tanhf_test1_validate( tests[i].value, tests[i].expected, tests[i].variance); + tanhf_test1_validate(-tests[i].value, -tests[i].expected, tests[i].variance); } - validate_isnan(PAL_NAN); + tanhf_test1_validate_isnan(PAL_NAN); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/testinfo.dat deleted file mode 100644 index 0aff9993874..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tanhf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = tanhf -Name = Positive Test for tanhf -TYPE = DEFAULT -EXE1 = test1 -Description -= Passes to tanhf() a series of angle value, checking that -= each one return to correct value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/time/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt deleted file mode 100644 index 7b43d7a7f21..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_time_test1 - ${SOURCES} -) - -add_dependencies(paltest_time_test1 coreclrpal) - -target_link_libraries(paltest_time_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp index 540794557ff..72d905be0a5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_time_test1_paltest_time_test1, "c_runtime/time/test1/paltest_time_test1") { time_t t = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/testinfo.dat deleted file mode 100644 index 664cbde0110..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/time/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = time -Name = Positive Test for time -TYPE = DEFAULT -EXE1 = test1 -Description -= Calls the time function and verifies that the time returned is at -= least a positive value. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt deleted file mode 100644 index 8fb53906389..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_tolower_test1 - ${SOURCES} -) - -add_dependencies(paltest_tolower_test1 coreclrpal) - -target_link_libraries(paltest_tolower_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp index 6e3f0a50b6e..b6723786245 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp @@ -21,7 +21,7 @@ struct testCase int start; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_tolower_test1_paltest_tolower_test1, "c_runtime/tolower/test1/paltest_tolower_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/testinfo.dat deleted file mode 100644 index 2abccb34995..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/tolower/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = tolower -Name = Positive Test for tolower -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the tolower function. -= Check that the tolower function makes capital character lower case. -= Also check that it has no effect on lower case letters and special -= characters. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt deleted file mode 100644 index 68541eb562b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_toupper_test1 - ${SOURCES} -) - -add_dependencies(paltest_toupper_test1 coreclrpal) - -target_link_libraries(paltest_toupper_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp index 546f898949b..1683aa3b9fc 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase int start; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_toupper_test1_paltest_toupper_test1, "c_runtime/toupper/test1/paltest_toupper_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/testinfo.dat deleted file mode 100644 index 285f8555e7c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/toupper/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = toupper -Name = Positive Test for toupper -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the toupper function. -= Check that the toupper function makes lower case character a capital. -= Also check that it has no effect on upper case letters and special -= characters. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt deleted file mode 100644 index 279882d712f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_towlower_test1 - ${SOURCES} -) - -add_dependencies(paltest_towlower_test1 coreclrpal) - -target_link_libraries(paltest_towlower_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp index 6900a8fd434..e17aad88bc4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp @@ -21,7 +21,7 @@ struct testCase WCHAR start; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_towlower_test1_paltest_towlower_test1, "c_runtime/towlower/test1/paltest_towlower_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/testinfo.dat deleted file mode 100644 index f6ea60afb68..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towlower/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = towlower -Name = Positive Test for towlower -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the towlower function. -= Check that the tolower function makes capital character lower case. -= Also check that it has no effect on lower case letters and special -= characters. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt deleted file mode 100644 index 95df931f4bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_towupper_test1 - ${SOURCES} -) - -add_dependencies(paltest_towupper_test1 coreclrpal) - -target_link_libraries(paltest_towupper_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp index a463a69d2ec..d2fd880d171 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp @@ -22,7 +22,7 @@ struct testCase WCHAR start; }; -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_towupper_test1_paltest_towupper_test1, "c_runtime/towupper/test1/paltest_towupper_test1") { int result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/testinfo.dat deleted file mode 100644 index b5977214b29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/towupper/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = towupper -Name = Positive Test for towupper -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the towupper function. -= Check that the towupper function makes lower case character a capital. -= Also check that it has no effect on upper case letters and special -= characters. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/CMakeLists.txt deleted file mode 100644 index 256753a6364..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt deleted file mode 100644 index 2bc1d344163..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vfprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test1 coreclrpal) - -target_link_libraries(paltest_vfprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp index 28432f87e65..8b088ba9a11 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../vfprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test1_paltest_vfprintf_test1, "c_runtime/vfprintf/test1/paltest_vfprintf_test1") { FILE *fp; char testfile[] = "testfile.txt"; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/testinfo.dat deleted file mode 100644 index fec5d5471f9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if vfprintf works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt deleted file mode 100644 index f15dcfec6bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vfprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test10 coreclrpal) - -target_link_libraries(paltest_vfprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp index 9065352728a..17d5a3f00af 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp @@ -17,7 +17,7 @@ #include "../vfprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test10_paltest_vfprintf_test10, "c_runtime/vfprintf/test10/paltest_vfprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/testinfo.dat deleted file mode 100644 index 4e310b6f0b5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests vfprintf with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt deleted file mode 100644 index fdefd96a8cb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vfprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test11 coreclrpal) - -target_link_libraries(paltest_vfprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp index 657d47baf9a..e545dba311a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../vfprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test11_paltest_vfprintf_test11, "c_runtime/vfprintf/test11/paltest_vfprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/testinfo.dat deleted file mode 100644 index 56a486fc988..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests vfprintf with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt deleted file mode 100644 index d53b2c1275c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vfprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test12 coreclrpal) - -target_link_libraries(paltest_vfprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp index 9063acf7b09..167c4b28635 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp @@ -17,7 +17,7 @@ #include "../vfprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test12_paltest_vfprintf_test12, "c_runtime/vfprintf/test12/paltest_vfprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/testinfo.dat deleted file mode 100644 index 1e0579e381c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests vfprintf with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt deleted file mode 100644 index 7e07a5034ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vfprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test13 coreclrpal) - -target_link_libraries(paltest_vfprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp index c2589697417..6c5e4ac24e7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test13_paltest_vfprintf_test13, "c_runtime/vfprintf/test13/paltest_vfprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/testinfo.dat deleted file mode 100644 index 337b3eed7ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests vfprintf with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt deleted file mode 100644 index eea6912b8e2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vfprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test14 coreclrpal) - -target_link_libraries(paltest_vfprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp index 194d47a285a..9602a0a1bd2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test14_paltest_vfprintf_test14, "c_runtime/vfprintf/test14/paltest_vfprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/testinfo.dat deleted file mode 100644 index 21a6782a11a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests vfprintf with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt deleted file mode 100644 index 1e88f42ff13..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vfprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test15 coreclrpal) - -target_link_libraries(paltest_vfprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp index de90698c9bb..050324de2a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test15_paltest_vfprintf_test15, "c_runtime/vfprintf/test15/paltest_vfprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/testinfo.dat deleted file mode 100644 index eeb64d431ec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests vfprintf with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt deleted file mode 100644 index d34097b4573..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vfprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test16 coreclrpal) - -target_link_libraries(paltest_vfprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp index eba3cbaae46..cc7dab4a4d6 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test16_paltest_vfprintf_test16, "c_runtime/vfprintf/test16/paltest_vfprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/testinfo.dat deleted file mode 100644 index bcfa56f113c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests vfprintf with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt deleted file mode 100644 index 15c53b87749..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vfprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test17 coreclrpal) - -target_link_libraries(paltest_vfprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp index add1f54cd02..e60694909ee 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test17_paltest_vfprintf_test17, "c_runtime/vfprintf/test17/paltest_vfprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/testinfo.dat deleted file mode 100644 index 6f4159a0118..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests vfprintf with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt deleted file mode 100644 index 1e91c5e043a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vfprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test18 coreclrpal) - -target_link_libraries(paltest_vfprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp index 6b4eea39725..e634c02aac5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test18_paltest_vfprintf_test18, "c_runtime/vfprintf/test18/paltest_vfprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/testinfo.dat deleted file mode 100644 index 41c470542d4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests vfprintf with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt deleted file mode 100644 index 41315534c92..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vfprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test19 coreclrpal) - -target_link_libraries(paltest_vfprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp index 53b1209364f..1e83dc6259e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test19_paltest_vfprintf_test19, "c_runtime/vfprintf/test19/paltest_vfprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/testinfo.dat deleted file mode 100644 index b8bccc7b2ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests vfprintf with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt deleted file mode 100644 index 3c2c738bf70..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vfprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test2 coreclrpal) - -target_link_libraries(paltest_vfprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp index f19665b6e1f..df7ba73ee1c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test2_paltest_vfprintf_test2, "c_runtime/vfprintf/test2/paltest_vfprintf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/testinfo.dat deleted file mode 100644 index 7fbe6596a7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests vfprintf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt deleted file mode 100644 index 85a4265b557..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vfprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test3 coreclrpal) - -target_link_libraries(paltest_vfprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp index b9ab319f2f9..96a08df5e3a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test3_paltest_vfprintf_test3, "c_runtime/vfprintf/test3/paltest_vfprintf_test3") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/testinfo.dat deleted file mode 100644 index 721c7c9e48c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests vfprintf with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt deleted file mode 100644 index 5907a8d71c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vfprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test4 coreclrpal) - -target_link_libraries(paltest_vfprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp index 8afbca48333..410c6ec1580 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test4_paltest_vfprintf_test4, "c_runtime/vfprintf/test4/paltest_vfprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/testinfo.dat deleted file mode 100644 index 7413dcc4f0e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests vfprintf with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt deleted file mode 100644 index 97e5e4b0043..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_vfprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test5 coreclrpal) - -target_link_libraries(paltest_vfprintf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp index 03a8bd60b55..ccea60e93e3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test5_paltest_vfprintf_test5, "c_runtime/vfprintf/test5/paltest_vfprintf_test5") { char *longStr = "really-long-string-that-just-keeps-going-on-and-on-and-on.." diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/testinfo.dat deleted file mode 100644 index bd5d1e00a5d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests vfprintf with the count specifier diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt deleted file mode 100644 index afe4f1aeb47..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vfprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test6 coreclrpal) - -target_link_libraries(paltest_vfprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp index afa0909d648..6404e8fca89 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test6_paltest_vfprintf_test6, "c_runtime/vfprintf/test6/paltest_vfprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/testinfo.dat deleted file mode 100644 index 3a6f60d2a3f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests vfprintf with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt deleted file mode 100644 index e528033157d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vfprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test7 coreclrpal) - -target_link_libraries(paltest_vfprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp index e8871b71600..05e88dcb1f5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test7_paltest_vfprintf_test7, "c_runtime/vfprintf/test7/paltest_vfprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/testinfo.dat deleted file mode 100644 index 0bfd81343a5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests vfprintf with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt deleted file mode 100644 index d131025ef00..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vfprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test8 coreclrpal) - -target_link_libraries(paltest_vfprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp index 3c689641744..ce046df8950 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test8_paltest_vfprintf_test8, "c_runtime/vfprintf/test8/paltest_vfprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/testinfo.dat deleted file mode 100644 index 05bfce9c193..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests vfprintf with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt deleted file mode 100644 index 68c07179a8f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vfprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vfprintf_test9 coreclrpal) - -target_link_libraries(paltest_vfprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp index f77ad5710ba..6a4bc39a52d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vfprintf_test9_paltest_vfprintf_test9, "c_runtime/vfprintf/test9/paltest_vfprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/testinfo.dat deleted file mode 100644 index af803d0ef2e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vfprintf -Name = Positive Test for vfprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests vfprintf with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h index 1e5bac108ca..f8aa9dc8aec 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h @@ -13,7 +13,7 @@ #ifndef __vfprintf_H__ #define __vfprintf_H__ -int DoVfprintf(FILE *fp, const char *format, ...) +inline int DoVfprintf(FILE *fp, const char *format, ...) { int retVal; va_list arglist; @@ -25,7 +25,7 @@ int DoVfprintf(FILE *fp, const char *format, ...) return (retVal); } -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_vfprintf(const char *formatstr, char* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -55,8 +55,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) } fclose(fp); } +#define DoStrTest DoStrTest_vfprintf -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_vfprintf(const char *formatstr, WCHAR* param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -86,9 +87,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) } fclose(fp); } +#define DoWStrTest DoWStrTest_vfprintf - -void DoPointerTest(const char *formatstr, void* param, char* paramstr, +inline void DoPointerTest_vfprintf(const char *formatstr, void* param, char* paramstr, const char *checkstr1) { FILE *fp; @@ -126,10 +127,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoPointerTest DoPointerTest_vfprintf - - -void DoCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoCountTest_vfprintf(const char *formatstr, int param, const char *checkstr) { FILE *fp; char buf[512] = { 0 }; @@ -171,8 +171,9 @@ void DoCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoCountTest DoCountTest_vfprintf -void DoShortCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_vfprintf(const char *formatstr, int param, const char *checkstr) { FILE *fp; char buf[512] = { 0 }; @@ -214,9 +215,9 @@ void DoShortCountTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: fclose failed to close \"testfile.txt\"\n"); } } +#define DoShortCountTest DoShortCountTest_vfprintf - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_vfprintf(const char *formatstr, char param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -246,8 +247,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) } fclose(fp); } +#define DoCharTest DoCharTest_vfprintf -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_vfprintf(const char *formatstr, WCHAR param, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -277,8 +279,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) } fclose(fp); } +#define DoWCharTest DoWCharTest_vfprintf -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_vfprintf(const char *formatstr, int value, const char *checkstr) { FILE *fp; char buf[256] = { 0 }; @@ -308,8 +311,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) } fclose(fp); } +#define DoNumTest DoNumTest_vfprintf -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) +inline void DoI64Test_vfprintf(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) { FILE *fp; char buf[256] = { 0 }; @@ -339,8 +343,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c } fclose(fp); } +#define DoI64Test DoI64Test_vfprintf -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, +inline void DoDoubleTest_vfprintf(const char *formatstr, double value, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -373,9 +378,9 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, } fclose(fp); } +#define DoDoubleTest DoDoubleTest_vfprintf - -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_vfprintf(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -416,8 +421,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, } } +#define DoArgumentPrecTest DoArgumentPrecTest_vfprintf -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_vfprintf(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { FILE *fp; @@ -457,6 +463,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_vfprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/CMakeLists.txt deleted file mode 100644 index 12016659f6b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# This test fails to build on ARM -#add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt deleted file mode 100644 index 12e210b906d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test1 coreclrpal) - -target_link_libraries(paltest_vprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp index 721ea27c12a..018055ca30d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../vprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test1_paltest_vprintf_test1, "c_runtime/vprintf/test1/paltest_vprintf_test1") { char checkstr[] = "hello world"; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/testinfo.dat deleted file mode 100644 index 36105e5acdd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if vprintf works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt deleted file mode 100644 index debfd71a7c4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test10 coreclrpal) - -target_link_libraries(paltest_vprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp index b7a6a1e2a25..e58ac1816db 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp @@ -17,7 +17,7 @@ #include "../vprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test10_paltest_vprintf_test10, "c_runtime/vprintf/test10/paltest_vprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/testinfo.dat deleted file mode 100644 index e6a506774d7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test10/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests vprintf with octal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt deleted file mode 100644 index 55d59ef7ba5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test11 coreclrpal) - -target_link_libraries(paltest_vprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp index 61b370236b0..b2718c995da 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../vprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test11_paltest_vprintf_test11, "c_runtime/vprintf/test11/paltest_vprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/testinfo.dat deleted file mode 100644 index 19b15fb3927..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test11/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests vprintf with unsigned numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt deleted file mode 100644 index 1211a7d55ac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test12 coreclrpal) - -target_link_libraries(paltest_vprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp index a44a60abf60..1cf22fef032 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp @@ -17,7 +17,7 @@ #include "../vprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test12_paltest_vprintf_test12, "c_runtime/vprintf/test12/paltest_vprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/testinfo.dat deleted file mode 100644 index 0b2af43a4ff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test12/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests vprintf with hex numbers (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt deleted file mode 100644 index 0d7943d61be..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test13 coreclrpal) - -target_link_libraries(paltest_vprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp index 8267a21f6f8..9919fab52a1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test13_paltest_vprintf_test13, "c_runtime/vprintf/test13/paltest_vprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/testinfo.dat deleted file mode 100644 index e962e317630..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test13/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests vprintf with hex numbers (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt deleted file mode 100644 index abf54434848..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test14 coreclrpal) - -target_link_libraries(paltest_vprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp index bba973a1e7f..874fc00dc45 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test14_paltest_vprintf_test14, "c_runtime/vprintf/test14/paltest_vprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/testinfo.dat deleted file mode 100644 index 6d8fd63fdb6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test14/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests vprintf with exponential format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt deleted file mode 100644 index 51e3c550101..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test15 coreclrpal) - -target_link_libraries(paltest_vprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp index 6ea26bab57f..d5b0d14c133 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test15_paltest_vprintf_test15, "c_runtime/vprintf/test15/paltest_vprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/testinfo.dat deleted file mode 100644 index bd474baf7d2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test15/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests vprintf with exponential format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt deleted file mode 100644 index 54588ed1c99..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test16 coreclrpal) - -target_link_libraries(paltest_vprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp index 7cb28491017..4834d8002f0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test16_paltest_vprintf_test16, "c_runtime/vprintf/test16/paltest_vprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/testinfo.dat deleted file mode 100644 index f70e7de261f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test16/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests vprintf with decimal point format doubles diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt deleted file mode 100644 index 657a41c442c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test17 coreclrpal) - -target_link_libraries(paltest_vprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp index 0d178b935f7..1711b0f013b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test17_paltest_vprintf_test17, "c_runtime/vprintf/test17/paltest_vprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/testinfo.dat deleted file mode 100644 index 75c5bf43e34..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test17/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests vprintf with compact format doubles (lowercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt deleted file mode 100644 index d0ad8fcb9a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test18 coreclrpal) - -target_link_libraries(paltest_vprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp index 67d491140aa..a5b7f54d5da 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test18_paltest_vprintf_test18, "c_runtime/vprintf/test18/paltest_vprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/testinfo.dat deleted file mode 100644 index 81e9efbf1fb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test18/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests vprintf with compact format doubles (uppercase) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt deleted file mode 100644 index f07d23607ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test19 coreclrpal) - -target_link_libraries(paltest_vprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp index abeb7ead6e3..d99abe7b8e0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test19_paltest_vprintf_test19, "c_runtime/vprintf/test19/paltest_vprintf_test19") { int n = -1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/testinfo.dat deleted file mode 100644 index cbd8547ae94..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test19/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests vprintf with argument specified precision diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt deleted file mode 100644 index 13edb26ca95..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test2 coreclrpal) - -target_link_libraries(paltest_vprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp index 7b4b133f992..ca43ae83fde 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test2_paltest_vprintf_test2, "c_runtime/vprintf/test2/paltest_vprintf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/testinfo.dat deleted file mode 100644 index 6abd0066b55..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests vprintf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt deleted file mode 100644 index c704c2ffd32..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test3 coreclrpal) - -target_link_libraries(paltest_vprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp index 62826cfbc5a..1348eb40b51 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test3_paltest_vprintf_test3, "c_runtime/vprintf/test3/paltest_vprintf_test3") { if (PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/testinfo.dat deleted file mode 100644 index c5776a92eb4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests vprintf with wide strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt deleted file mode 100644 index fdb5acd9a74..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test4 coreclrpal) - -target_link_libraries(paltest_vprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp index 6a915b82fde..bf98ec23ba9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp @@ -19,7 +19,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test4_paltest_vprintf_test4, "c_runtime/vprintf/test4/paltest_vprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/testinfo.dat deleted file mode 100644 index 30c18365d8e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests vprintf with pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt deleted file mode 100644 index 13c660c1b51..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_vprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test5 coreclrpal) - -target_link_libraries(paltest_vprintf_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp index 69a9f0d2405..a2b3233b5ac 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test5_paltest_vprintf_test5, "c_runtime/vprintf/test5/paltest_vprintf_test5") { char *longStr = "really-long-string-that-just-keeps-going-on-and-on-and-on.." diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/testinfo.dat deleted file mode 100644 index b1c3e8cf497..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests vprintf with the count specifier diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt deleted file mode 100644 index df9ec1916cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test6 coreclrpal) - -target_link_libraries(paltest_vprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp index 3a04a514205..5c6bec8c493 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test6_paltest_vprintf_test6, "c_runtime/vprintf/test6/paltest_vprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/testinfo.dat deleted file mode 100644 index f762bc6e9cb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests vprintf with characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt deleted file mode 100644 index d0086a9b362..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test7 coreclrpal) - -target_link_libraries(paltest_vprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp index 14bef0bf965..d735623d082 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test7_paltest_vprintf_test7, "c_runtime/vprintf/test7/paltest_vprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/testinfo.dat deleted file mode 100644 index 399518e6ffd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests vprintf with wide characters diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt deleted file mode 100644 index c47e2cf16ec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test8 coreclrpal) - -target_link_libraries(paltest_vprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp index bed3b18b309..7c1128d3653 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test8_paltest_vprintf_test8, "c_runtime/vprintf/test8/paltest_vprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/testinfo.dat deleted file mode 100644 index 0bb7038786f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test8/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests vprintf with decimal numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt deleted file mode 100644 index 521e354c3ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vprintf_test9 coreclrpal) - -target_link_libraries(paltest_vprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp index 4f8a05e4ce5..44004d35ce1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vprintf_test9_paltest_vprintf_test9, "c_runtime/vprintf/test9/paltest_vprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/testinfo.dat deleted file mode 100644 index 38b887dd1c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vprintf -Name = Positive Test for vprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests vprintf with integer numbers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h index 87e7956b762..cdb0f4e5ee3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h @@ -13,7 +13,7 @@ #ifndef __vprintf_H__ #define __vprintf_H__ -int DoVprintf(const char *format, ...) +inline int DoVprintf(const char *format, ...) { int retVal; va_list arglist; @@ -25,7 +25,7 @@ int DoVprintf(const char *format, ...) return (retVal); } -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_vprintf(const char *formatstr, char* param, const char *checkstr) { int ret; @@ -36,8 +36,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) strlen(checkstr), ret); } } +#define DoStrTest DoStrTest_vprintf -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_vprintf(const char *formatstr, WCHAR* param, const char *checkstr) { int ret; @@ -48,8 +49,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) strlen(checkstr), ret); } } +#define DoWStrTest DoWStrTest_vprintf -void DoPointerTest(const char *formatstr, void* param, char* paramstr, +inline void DoPointerTest_vprintf(const char *formatstr, void* param, char* paramstr, const char *checkstr1) { int ret; @@ -61,8 +63,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, strlen(checkstr1), ret); } } +#define DoPointerTest DoPointerTest_vprintf -void DoCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoCountTest_vprintf(const char *formatstr, int param, const char *checkstr) { int ret; int n = -1; @@ -80,8 +83,9 @@ void DoCountTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoCountTest DoCountTest_vprintf -void DoShortCountTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortCountTest_vprintf(const char *formatstr, int param, const char *checkstr) { int ret; short int n = -1; @@ -99,9 +103,9 @@ void DoShortCountTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoShortCountTest DoShortCountTest_vprintf - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_vprintf(const char *formatstr, char param, const char *checkstr) { int ret; @@ -112,8 +116,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) strlen(checkstr), ret); } } +#define DoCharTest DoCharTest_vprintf -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_vprintf(const char *formatstr, WCHAR param, const char *checkstr) { int ret; @@ -124,8 +129,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) strlen(checkstr), ret); } } +#define DoWCharTest DoWCharTest_vprintf -void DoNumTest(const char *formatstr, int param, const char *checkstr) +inline void DoNumTest_vprintf(const char *formatstr, int param, const char *checkstr) { int ret; @@ -136,8 +142,9 @@ void DoNumTest(const char *formatstr, int param, const char *checkstr) strlen(checkstr), ret); } } +#define DoNumTest DoNumTest_vprintf -void DoI64Test(const char *formatstr, INT64 param, char *valuestr, const char *checkstr1) +inline void DoI64Test_vprintf(const char *formatstr, INT64 param, char *valuestr, const char *checkstr1) { int ret; @@ -148,8 +155,9 @@ void DoI64Test(const char *formatstr, INT64 param, char *valuestr, const char *c strlen(checkstr1), ret); } } +#define DoI64Test DoI64Test_vprintf -void DoDoubleTest(const char *formatstr, double param, const char *checkstr1, +inline void DoDoubleTest_vprintf(const char *formatstr, double param, const char *checkstr1, const char *checkstr2) { int ret; @@ -161,8 +169,9 @@ void DoDoubleTest(const char *formatstr, double param, const char *checkstr1, strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoDoubleTest DoDoubleTest_vprintf -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_vprintf(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { int ret; @@ -174,8 +183,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoArgumentPrecTest DoArgumentPrecTest_vprintf -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_vprintf(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { int ret; @@ -187,6 +197,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param strlen(checkstr1), strlen(checkstr2), ret); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_vprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt deleted file mode 100644 index cc1afb75245..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vsprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test1 coreclrpal) - -target_link_libraries(paltest_vsprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp index b210afe7ce4..09b0b9f0111 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test1_paltest_vsprintf_test1, "c_runtime/vsprintf/test1/paltest_vsprintf_test1") { char checkstr[] = "hello world"; char buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/testinfo.dat deleted file mode 100644 index a8986b564e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the vsprintf function. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt deleted file mode 100644 index 2ef1be6ffd0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vsprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test10 coreclrpal) - -target_link_libraries(paltest_vsprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp index 81e3f833bae..57523d77526 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test10_paltest_vsprintf_test10, "c_runtime/vsprintf/test10/paltest_vsprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/testinfo.dat deleted file mode 100644 index 51c02697aa0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test10/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with octal numbers. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt deleted file mode 100644 index 80825409db2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vsprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test11 coreclrpal) - -target_link_libraries(paltest_vsprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp index da58cbad4e4..8524870ebe5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test11_paltest_vsprintf_test11, "c_runtime/vsprintf/test11/paltest_vsprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/testinfo.dat deleted file mode 100644 index a43d38bc04f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test11/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with unsigned numbers. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt deleted file mode 100644 index 4f84c438dfc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vsprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test12 coreclrpal) - -target_link_libraries(paltest_vsprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp index 77852434416..5b82544f108 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test12_paltest_vsprintf_test12, "c_runtime/vsprintf/test12/paltest_vsprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/testinfo.dat deleted file mode 100644 index 4415fa60459..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test12/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with hex numbers (lowercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt deleted file mode 100644 index 53779dc7bb0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vsprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test13 coreclrpal) - -target_link_libraries(paltest_vsprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp index 6422543f795..b3b70017362 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test13_paltest_vsprintf_test13, "c_runtime/vsprintf/test13/paltest_vsprintf_test13") { int neg = -42; int pos = 0x1234AB; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/testinfo.dat deleted file mode 100644 index 9fd558e0da2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test13/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with hex numbers (uppercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt deleted file mode 100644 index d08d6069e42..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vsprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test14 coreclrpal) - -target_link_libraries(paltest_vsprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp index de8395aa7f6..7c8ed0e8b02 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test14_paltest_vsprintf_test14, "c_runtime/vsprintf/test14/paltest_vsprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/testinfo.dat deleted file mode 100644 index 81232f2e7dc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with exponential format doubles (lowercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt deleted file mode 100644 index f45c76840e9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vsprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test15 coreclrpal) - -target_link_libraries(paltest_vsprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp index 760fa0081bc..ccf2a329bbb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test15_paltest_vsprintf_test15, "c_runtime/vsprintf/test15/paltest_vsprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/testinfo.dat deleted file mode 100644 index 01063b6a8f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with exponential format doubles (uppercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt deleted file mode 100644 index c80de471079..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vsprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test16 coreclrpal) - -target_link_libraries(paltest_vsprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp index 65159efe590..813077192bb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test16_paltest_vsprintf_test16, "c_runtime/vsprintf/test16/paltest_vsprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/testinfo.dat deleted file mode 100644 index 28828b2f494..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test16/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with decimal point format doubles. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt deleted file mode 100644 index 6eceb5b2c5e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vsprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test17 coreclrpal) - -target_link_libraries(paltest_vsprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp index d37c27b3a2e..efc3344d71e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test17_paltest_vsprintf_test17, "c_runtime/vsprintf/test17/paltest_vsprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/testinfo.dat deleted file mode 100644 index 26d759bed51..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test17/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with compact format doubles (lowercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt deleted file mode 100644 index 2fd06bc144f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vsprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test18 coreclrpal) - -target_link_libraries(paltest_vsprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp index 31fc132a5e1..318df068064 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test18_paltest_vsprintf_test18, "c_runtime/vsprintf/test18/paltest_vsprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/testinfo.dat deleted file mode 100644 index fb05cb1966c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test18/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with compact format doubles (uppercase). -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt deleted file mode 100644 index ed0920635c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vsprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test19 coreclrpal) - -target_link_libraries(paltest_vsprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp index 4136033c29e..622e2f05043 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test19_paltest_vsprintf_test19, "c_runtime/vsprintf/test19/paltest_vsprintf_test19") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/testinfo.dat deleted file mode 100644 index 262786d91a0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test19/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with argument specified precision. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt deleted file mode 100644 index ccc24cdf207..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vsprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test2 coreclrpal) - -target_link_libraries(paltest_vsprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp index e2dea2c655e..0c91e8f2ac8 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp @@ -16,7 +16,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test2_paltest_vsprintf_test2, "c_runtime/vsprintf/test2/paltest_vsprintf_test2") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/testinfo.dat deleted file mode 100644 index eeb5836831a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with strings. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt deleted file mode 100644 index 16436779de2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vsprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test3 coreclrpal) - -target_link_libraries(paltest_vsprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp index be9e5270bee..adfe6fb2555 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test3_paltest_vsprintf_test3, "c_runtime/vsprintf/test3/paltest_vsprintf_test3") { if (PAL_Initialize(argc, argv) != 0) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/testinfo.dat deleted file mode 100644 index ecb6acb657a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with wide strings. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt deleted file mode 100644 index b53a17b14e4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vsprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test4 coreclrpal) - -target_link_libraries(paltest_vsprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp index 5b71f63390e..9318f0659e9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test4_paltest_vsprintf_test4, "c_runtime/vsprintf/test4/paltest_vsprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/testinfo.dat deleted file mode 100644 index 63581f71eaf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with pointers. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt deleted file mode 100644 index 3e2d95a50d8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vsprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test6 coreclrpal) - -target_link_libraries(paltest_vsprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp index 8b68bc9c915..4560fb27fdb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp @@ -17,7 +17,7 @@ * Notes: memcmp is used, as is strlen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test6_paltest_vsprintf_test6, "c_runtime/vsprintf/test6/paltest_vsprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/testinfo.dat deleted file mode 100644 index 0afdeaa8328..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with characters. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt deleted file mode 100644 index 740a1dcead2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vsprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test7 coreclrpal) - -target_link_libraries(paltest_vsprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp index 5bb113376df..9bdd339535c 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test7_paltest_vsprintf_test7, "c_runtime/vsprintf/test7/paltest_vsprintf_test7") { WCHAR wb = (WCHAR) 'b'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/testinfo.dat deleted file mode 100644 index 239796200ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with wide characters. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt deleted file mode 100644 index 455311cf5be..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vsprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test8 coreclrpal) - -target_link_libraries(paltest_vsprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp index e83e6b5c9f1..c805dc5259e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test8_paltest_vsprintf_test8, "c_runtime/vsprintf/test8/paltest_vsprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/testinfo.dat deleted file mode 100644 index 37cecfa8dad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test8/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with decimal numbers. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt deleted file mode 100644 index 7c5fc6c5769..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vsprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test9 coreclrpal) - -target_link_libraries(paltest_vsprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp index 16fc3db29f7..5f27679174a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp @@ -18,7 +18,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vsprintf_test9_paltest_vsprintf_test9, "c_runtime/vsprintf/test9/paltest_vsprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/testinfo.dat deleted file mode 100644 index 922474c8368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/test9/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with integer numbers. -= This test is modeled after _snprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h index f5556691efd..00e459b3db0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h @@ -13,7 +13,7 @@ #define __VSPRINTF_H__ /* These functions leaks memory a lot. C'est la vie. */ -int testvsp(char* buf, size_t buffSize, const char* format, ...) +inline int testvsp(char* buf, size_t buffSize, const char* format, ...) { int retVal; va_list arglist; @@ -25,7 +25,7 @@ int testvsp(char* buf, size_t buffSize, const char* format, ...) return (retVal); } -void DoStrTest(const char *formatstr, char* param, const char *checkstr) +inline void DoStrTest_vsprintf(const char *formatstr, char* param, const char *checkstr) { char buf[256] = { 0 }; @@ -37,8 +37,9 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) param, formatstr, checkstr, buf); } } +#define DoStrTest DoStrTest_vsprintf -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +inline void DoWStrTest_vsprintf(const char *formatstr, WCHAR* param, const char *checkstr) { char buf[256] = { 0 }; @@ -50,9 +51,9 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) convertC(param), formatstr, checkstr, buf); } } +#define DoWStrTest DoWStrTest_vsprintf - -void DoCharTest(const char *formatstr, char param, const char *checkstr) +inline void DoCharTest_vsprintf(const char *formatstr, char param, const char *checkstr) { char buf[256] = { 0 }; @@ -64,8 +65,9 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) param, param, formatstr, checkstr, buf); } } +#define DoCharTest DoCharTest_vsprintf -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +inline void DoWCharTest_vsprintf(const char *formatstr, WCHAR param, const char *checkstr) { char buf[256] = { 0 }; @@ -77,8 +79,9 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) (char)param, param, formatstr, checkstr, buf); } } +#define DoWCharTest DoWCharTest_vsprintf -void DoNumTest(const char *formatstr, int value, const char *checkstr) +inline void DoNumTest_vsprintf(const char *formatstr, int value, const char *checkstr) { char buf[256] = { 0 }; @@ -90,8 +93,9 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) value, formatstr, checkstr, buf); } } +#define DoNumTest DoNumTest_vsprintf -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) +inline void DoI64Test_vsprintf(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) { char buf[256] = { 0 }; @@ -103,7 +107,9 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c valuestr, formatstr, checkstr, buf); } } -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char +#define DoI64Test DoI64Test_vsprintf + +inline void DoDoubleTest_vsprintf(const char *formatstr, double value, const char *checkstr1, char *checkstr2) { char buf[256] = { 0 }; @@ -117,8 +123,10 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, ch value, formatstr, checkstr1, checkstr2, buf); } } +#define DoDoubleTest DoDoubleTest_vsprintf + /*FROM TEST 9*/ -void DoArgumentPrecTest(const char *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_vsprintf(const char *formatstr, int precision, void *param, char *paramstr, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -133,8 +141,9 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, } } +#define DoArgumentPrecTest DoArgumentPrecTest_vsprintf -void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_vsprintf(const char *formatstr, int precision, double param, const char *checkstr1, const char *checkstr2) { char buf[256]; @@ -148,8 +157,10 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param precision, checkstr1, checkstr2, buf); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_vsprintf + /*FROM TEST4*/ -void DoPointerTest(const char *formatstr, void* param, char* paramstr, +inline void DoPointerTest_vsprintf(const char *formatstr, void* param, char* paramstr, const char *checkstr1) { char buf[256] = { 0 }; @@ -162,8 +173,9 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, paramstr, formatstr, checkstr1, buf); } } +#define DoPointerTest DoPointerTest_vsprintf -void DoI64DoubleTest(const char *formatstr, INT64 value, char *valuestr, +inline void DoI64DoubleTest_vsprintf(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1) { char buf[256] = { 0 }; @@ -176,8 +188,9 @@ void DoI64DoubleTest(const char *formatstr, INT64 value, char *valuestr, valuestr, formatstr, checkstr1, buf); } } +#define DoI64DoubleTest DoI64DoubleTest_vsprintf -void DoTest(const char *formatstr, int param, const char *checkstr) +inline void DoTest_vsprintf(const char *formatstr, int param, const char *checkstr) { char buf[256] = { 0 }; int n = -1; @@ -194,8 +207,9 @@ void DoTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoTest DoTest_vsprintf -void DoShortTest(const char *formatstr, int param, const char *checkstr) +inline void DoShortTest_vsprintf(const char *formatstr, int param, const char *checkstr) { char buf[256] = { 0 }; short int n = -1; @@ -212,6 +226,7 @@ void DoShortTest(const char *formatstr, int param, const char *checkstr) Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); } } +#define DoShortTest DoShortTest_vsprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt deleted file mode 100644 index b29c7c438bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt deleted file mode 100644 index 3bb7e5f9719..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_vswprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test1 coreclrpal) - -target_link_libraries(paltest_vswprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp index 988c0e0e17f..954f8f99f13 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test1_paltest_vswprintf_test1, "c_runtime/vswprintf/test1/paltest_vswprintf_test1") { WCHAR *checkstr = NULL; WCHAR buf[256] = { 0 }; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/testinfo.dat deleted file mode 100644 index ca72ebc538b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the vswprintf function. -= General test to see if vswprintf works correctly. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt deleted file mode 100644 index 3a17ef2fa4b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_vswprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test10 coreclrpal) - -target_link_libraries(paltest_vswprintf_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp index 58ea624ee9c..2ace4742894 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test10_paltest_vswprintf_test10, "c_runtime/vswprintf/test10/paltest_vswprintf_test10") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/testinfo.dat deleted file mode 100644 index 994dead97da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test10/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with octal numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt deleted file mode 100644 index 7040c2e01b3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test11.cpp -) - -add_executable(paltest_vswprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test11 coreclrpal) - -target_link_libraries(paltest_vswprintf_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp index a78b5963ff8..2e24f5bfd71 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test11_paltest_vswprintf_test11, "c_runtime/vswprintf/test11/paltest_vswprintf_test11") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/testinfo.dat deleted file mode 100644 index d7182fedf7a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test11/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with unsigned numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt deleted file mode 100644 index 40778fa304f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_vswprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test12 coreclrpal) - -target_link_libraries(paltest_vswprintf_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp index c5e0b168085..e80c7061756 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test12_paltest_vswprintf_test12, "c_runtime/vswprintf/test12/paltest_vswprintf_test12") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/testinfo.dat deleted file mode 100644 index e23f936c182..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test12/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with hex numbers (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt deleted file mode 100644 index 26b85809e0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test13.cpp -) - -add_executable(paltest_vswprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test13 coreclrpal) - -target_link_libraries(paltest_vswprintf_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp index b84836b214f..081c63ea0cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test13_paltest_vswprintf_test13, "c_runtime/vswprintf/test13/paltest_vswprintf_test13") { int neg = -42; int pos = 0x1234ab; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/testinfo.dat deleted file mode 100644 index a4a46b7329e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test13/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with hex numbers (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt deleted file mode 100644 index 0e5366e131d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test14.cpp -) - -add_executable(paltest_vswprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test14 coreclrpal) - -target_link_libraries(paltest_vswprintf_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp index 5e948e8768c..5e00bf55963 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test14_paltest_vswprintf_test14, "c_runtime/vswprintf/test14/paltest_vswprintf_test14") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/testinfo.dat deleted file mode 100644 index 8194ceee56c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test14/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with exponential format doubles (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt deleted file mode 100644 index 23e9595a7df..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test15.cpp -) - -add_executable(paltest_vswprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test15 coreclrpal) - -target_link_libraries(paltest_vswprintf_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp index fcfac5497ac..2dddd1a937d 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test15_paltest_vswprintf_test15, "c_runtime/vswprintf/test15/paltest_vswprintf_test15") { double val = 256.0; double neg = -256.0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/testinfo.dat deleted file mode 100644 index 0f1e42efff0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test15/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with exponential format doubles (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt deleted file mode 100644 index b398fdc1d81..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test16.cpp -) - -add_executable(paltest_vswprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test16 coreclrpal) - -target_link_libraries(paltest_vswprintf_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp index e0f0fea2a2b..a8f7f8f1b16 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test16_paltest_vswprintf_test16, "c_runtime/vswprintf/test16/paltest_vswprintf_test16") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/testinfo.dat deleted file mode 100644 index 2c2f716d0e9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test16/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with decimal point format doubles. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt deleted file mode 100644 index 8b505dee0b6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test17.cpp -) - -add_executable(paltest_vswprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test17 coreclrpal) - -target_link_libraries(paltest_vswprintf_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp index 635fb2b00ee..08ec3fe1b81 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test17_paltest_vswprintf_test17, "c_runtime/vswprintf/test17/paltest_vswprintf_test17") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/testinfo.dat deleted file mode 100644 index a99a9d150e8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test17/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with compact format doubles (lowercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt deleted file mode 100644 index 0fc1f0dad4d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test18.cpp -) - -add_executable(paltest_vswprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test18 coreclrpal) - -target_link_libraries(paltest_vswprintf_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp index 4318a5f4e67..cf59b137da1 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test18_paltest_vswprintf_test18, "c_runtime/vswprintf/test18/paltest_vswprintf_test18") { double val = 2560.001; double neg = -2560.001; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/testinfo.dat deleted file mode 100644 index b022db560ee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test18/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with compact format doubles (uppercase). -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt deleted file mode 100644 index b974935de7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test19.cpp -) - -add_executable(paltest_vswprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test19 coreclrpal) - -target_link_libraries(paltest_vswprintf_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp index 70f586f77b5..482c442f03a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp @@ -18,7 +18,7 @@ #define DOTEST(a,b,c,d,e) DoTest(a,b,(void*)c,d,e) -void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, +void DoArgumentPrecTest_vswprintf(WCHAR *formatstr, int precision, void *param, WCHAR *paramstr, WCHAR *checkstr1, WCHAR *checkstr2) { WCHAR buf[256]; @@ -37,7 +37,7 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, convertC(buf)); } } -void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, +void DoArgumentPrecDoubleTest_vswprintf(WCHAR *formatstr, int precision, double param, WCHAR *checkstr1, WCHAR *checkstr2) { WCHAR buf[256]; @@ -60,75 +60,75 @@ void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, * Uses memcmp & wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test19_paltest_vswprintf_test19, "c_runtime/vswprintf/test19/paltest_vswprintf_test19") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); - DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"), + DoArgumentPrecTest_vswprintf(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"), convert("ba"), convert("ba")); - DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', convert("a"), + DoArgumentPrecTest_vswprintf(convert("%.*c"), 0, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*c"), 4, (void*)'a', convert("a"), + DoArgumentPrecTest_vswprintf(convert("%.*c"), 4, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*C"), 0, (void*)'a', convert("a"), + DoArgumentPrecTest_vswprintf(convert("%.*C"), 0, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*C"), 4, (void*)'a', convert("a"), + DoArgumentPrecTest_vswprintf(convert("%.*C"), 4, (void*)'a', convert("a"), convert("a"), convert("a")); - DoArgumentPrecTest(convert("%.*d"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*d"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*d"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*d"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*i"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*i"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*i"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*i"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*o"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*o"), 1, (void*)42, convert("42"), convert("52"), convert("52")); - DoArgumentPrecTest(convert("%.*o"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*o"), 3, (void*)42, convert("42"), convert("052"), convert("052")); - DoArgumentPrecTest(convert("%.*u"), 1, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*u"), 1, (void*)42, convert("42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*u"), 3, (void*)42, convert("42"), + DoArgumentPrecTest_vswprintf(convert("%.*u"), 3, (void*)42, convert("42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*x"), 1, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vswprintf(convert("%.*x"), 1, (void*)0x42, convert("0x42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*x"), 3, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vswprintf(convert("%.*x"), 3, (void*)0x42, convert("0x42"), convert("042"), convert("042")); - DoArgumentPrecTest(convert("%.*X"), 1, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vswprintf(convert("%.*X"), 1, (void*)0x42, convert("0x42"), convert("42"), convert("42")); - DoArgumentPrecTest(convert("%.*X"), 3, (void*)0x42, convert("0x42"), + DoArgumentPrecTest_vswprintf(convert("%.*X"), 3, (void*)0x42, convert("0x42"), convert("042"), convert("042")); - DoArgumentPrecDoubleTest(convert("%.*e"), 1, 2.01, convert("2.0e+000"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*e"), 1, 2.01, convert("2.0e+000"), convert("2.0e+00")); - DoArgumentPrecDoubleTest(convert("%.*e"), 3, 2.01, convert("2.010e+000"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*e"), 3, 2.01, convert("2.010e+000"), convert("2.010e+00")); - DoArgumentPrecDoubleTest(convert("%.*E"), 1, 2.01, convert("2.0E+000"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*E"), 1, 2.01, convert("2.0E+000"), convert("2.0E+00")); - DoArgumentPrecDoubleTest(convert("%.*E"), 3, 2.01, convert("2.010E+000"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*E"), 3, 2.01, convert("2.010E+000"), convert("2.010E+00")); - DoArgumentPrecDoubleTest(convert("%.*f"), 1, 2.01, convert("2.0"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*f"), 1, 2.01, convert("2.0"), convert("2.0")); - DoArgumentPrecDoubleTest(convert("%.*f"), 3, 2.01, convert("2.010"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*f"), 3, 2.01, convert("2.010"), convert("2.010")); - DoArgumentPrecDoubleTest(convert("%.*g"), 1, 256.01, convert("3e+002"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*g"), 1, 256.01, convert("3e+002"), convert("3e+02")); - DoArgumentPrecDoubleTest(convert("%.*g"), 3, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*g"), 3, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*g"), 4, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*g"), 4, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*g"), 6, 256.01, convert("256.01"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*g"), 6, 256.01, convert("256.01"), convert("256.01")); - DoArgumentPrecDoubleTest(convert("%.*G"), 1, 256.01, convert("3E+002"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*G"), 1, 256.01, convert("3E+002"), convert("3E+02")); - DoArgumentPrecDoubleTest(convert("%.*G"), 3, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*G"), 3, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*G"), 4, 256.01, convert("256"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*G"), 4, 256.01, convert("256"), convert("256")); - DoArgumentPrecDoubleTest(convert("%.*G"), 6, 256.01, convert("256.01"), + DoArgumentPrecDoubleTest_vswprintf(convert("%.*G"), 6, 256.01, convert("256.01"), convert("256.01")); PAL_Terminate(); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/testinfo.dat deleted file mode 100644 index 37ad02278b3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test19/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with argument specified precision. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt deleted file mode 100644 index 78550ca27b4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_vswprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test2 coreclrpal) - -target_link_libraries(paltest_vswprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp index 215c26b679f..4b1b09619e5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test2_paltest_vswprintf_test2, "c_runtime/vswprintf/test2/paltest_vswprintf_test2") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/testinfo.dat deleted file mode 100644 index f10b42f6fbf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with strings. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt deleted file mode 100644 index 95247ceaea1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_vswprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test3 coreclrpal) - -target_link_libraries(paltest_vswprintf_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp index e361074ec26..2644c4a96be 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp @@ -17,7 +17,7 @@ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test3_paltest_vswprintf_test3, "c_runtime/vswprintf/test3/paltest_vswprintf_test3") { if (PAL_Initialize(argc, argv) != 0) return(FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/testinfo.dat deleted file mode 100644 index 31fbe7cb21b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with wide strings. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt deleted file mode 100644 index dbaa6ac69ae..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_vswprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test4 coreclrpal) - -target_link_libraries(paltest_vswprintf_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp index aea717f105b..8e72f735224 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp @@ -50,7 +50,7 @@ static void DoI64DoubleTest(WCHAR *formatstr, INT64 value, WCHAR *valuestr, } } -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test4_paltest_vswprintf_test4, "c_runtime/vswprintf/test4/paltest_vswprintf_test4") { void *ptr = (void*) 0x123456; INT64 lptr = I64(0x1234567887654321); diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/testinfo.dat deleted file mode 100644 index f0a23f0f146..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with pointers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt deleted file mode 100644 index 40b3b50f017..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_vswprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test6 coreclrpal) - -target_link_libraries(paltest_vswprintf_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp index d9e47a15618..e6c3de0641b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test6_paltest_vswprintf_test6, "c_runtime/vswprintf/test6/paltest_vswprintf_test6") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/testinfo.dat deleted file mode 100644 index 2b7032408c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with characters. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt deleted file mode 100644 index 96ef5052d84..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_vswprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test7 coreclrpal) - -target_link_libraries(paltest_vswprintf_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp index 789e32983e3..22f87093de3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test7_paltest_vswprintf_test7, "c_runtime/vswprintf/test7/paltest_vswprintf_test7") { WCHAR wc = (WCHAR) 'c'; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/testinfo.dat deleted file mode 100644 index 71011f070f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with wide characters. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt deleted file mode 100644 index 2fb6548b62b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_vswprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test8 coreclrpal) - -target_link_libraries(paltest_vswprintf_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp index a500b073b7a..7ffcf2355e4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test8_paltest_vswprintf_test8, "c_runtime/vswprintf/test8/paltest_vswprintf_test8") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/testinfo.dat deleted file mode 100644 index 0293f2dc0a4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test8/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with decimal numbers. -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt deleted file mode 100644 index ef38e3cceb5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_vswprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test9 coreclrpal) - -target_link_libraries(paltest_vswprintf_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp index 07754e2f63f..b965466afff 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp @@ -16,7 +16,7 @@ /* memcmp is used to verify the results, so this test is dependent on it. */ /* ditto with wcslen */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_vswprintf_test9_paltest_vswprintf_test9, "c_runtime/vswprintf/test9/paltest_vswprintf_test9") { int neg = -42; int pos = 42; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/testinfo.dat deleted file mode 100644 index a05265d7967..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/test9/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with integer numbers -= This test is modeled after _snwprintf. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h index ac72491695e..c360c00db4e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h @@ -14,7 +14,7 @@ #define __vswprintf_H__ /* These functions leaks memory a lot. C'est la vie. */ -int testvswp(char16_t* buf, size_t buffSize, const char16_t* format, ...) +inline int testvswp(char16_t* buf, size_t buffSize, const char16_t* format, ...) { int retVal = 0; va_list arglist; @@ -26,7 +26,7 @@ int testvswp(char16_t* buf, size_t buffSize, const char16_t* format, ...) return( retVal); } -void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) +inline void DoWStrTest_vswprintf_s(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -40,8 +40,9 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoWStrTest DoWStrTest_vswprintf_s -void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) +inline void DoStrTest_vswprintf_s(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -55,8 +56,9 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) convertC(buf)); } } +#define DoStrTest DoStrTest_vswprintf_s -void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) +inline void DoCharTest_vswprintf_s(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -69,8 +71,9 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) convertC(buf)); } } +#define DoCharTest DoCharTest_vswprintf_s -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoWCharTest_vswprintf_s(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -83,8 +86,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) convertC(buf)); } } +#define DoWCharTest DoWCharTest_vswprintf_s -void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) +inline void DoNumTest_vswprintf_s(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -96,8 +100,9 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) convertC(checkstr), convertC(buf)); } } +#define DoNumTest DoNumTest_vswprintf_s -void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr) +inline void DoI64NumTest_vswprintf_s(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; @@ -109,7 +114,9 @@ void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCH convertC(checkstr), convertC(buf)); } } -void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, WCHAR +#define DoI64NumTest DoI64NumTest_vswprintf_s + +inline void DoDoubleTest_vswprintf_s(const WCHAR *formatstr, double value, const WCHAR *checkstr1, WCHAR *checkstr2) { WCHAR buf[256] = { 0 }; @@ -127,5 +134,6 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, convertC(buf)); } } +#define DoDoubleTest DoDoubleTest_vswprintf_s #endif diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt deleted file mode 100644 index 08cd49f05dc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcscat_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcscat_test1 coreclrpal) - -target_link_libraries(paltest_wcscat_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp index c1f6f169f77..da8f581554b 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp @@ -20,7 +20,7 @@ * Notes: uses memcmp and the (pal) sprintf_s */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcscat_test1_paltest_wcscat_test1, "c_runtime/wcscat/test1/paltest_wcscat_test1") { WCHAR dest[80]; WCHAR test[] = {'f','o','o',' ','b','a','r',' ','b','a','z',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/testinfo.dat deleted file mode 100644 index 8f5cff0e9d6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscat/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcscat -Name = Positive Test for wcscat -TYPE = DEFAULT -EXE1 = test1 -Description -= Test to that wcscat correctly concatanates wide strings, including placing -= null pointers diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt deleted file mode 100644 index 1687e57b87b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcschr_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcschr_test1 coreclrpal) - -target_link_libraries(paltest_wcschr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp index eeecf331a10..02276da03a5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcschr_test1_paltest_wcschr_test1, "c_runtime/wcschr/test1/paltest_wcschr_test1") { WCHAR str[] = {'f','o','o',' ','b','a','r',' ',0}; WCHAR c = (WCHAR)' '; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/testinfo.dat deleted file mode 100644 index 59e4d32dd31..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcschr/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcschr -Name = Positive Test for wcschr -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcschr correctly finds the first occurrence of a character in a -= string. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt deleted file mode 100644 index a556133020a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcscmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcscmp_test1 coreclrpal) - -target_link_libraries(paltest_wcscmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp index 0b374518b05..f7d2c12aa56 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcscmp_test1_paltest_wcscmp_test1, "c_runtime/wcscmp/test1/paltest_wcscmp_test1") { WCHAR str1[] = {'f','o','o',0}; WCHAR str2[] = {'f','o','o','x',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/testinfo.dat deleted file mode 100644 index 9d5c60a0352..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscmp/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcscmp -Name = Test #1 for wcscmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcscmp correctly compares two strings with case sensitivity. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt deleted file mode 100644 index 8a004085eac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcscpy_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcscpy_test1 coreclrpal) - -target_link_libraries(paltest_wcscpy_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp index a2b98c5b6d4..2c0c9afa874 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp @@ -17,7 +17,7 @@ * Notes: uses memcmp and sprintf_s. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcscpy_test1_paltest_wcscpy_test1, "c_runtime/wcscpy/test1/paltest_wcscpy_test1") { WCHAR str[] = {'f','o','o',0,'b','a','r',0}; WCHAR dest[80]; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/testinfo.dat deleted file mode 100644 index b989c145569..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcscpy/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcscpy -Name = Positive Test for wcscpy -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcscpy correctly copies a null-terminated wide string. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt deleted file mode 100644 index 474f226fcc2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcslen_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcslen_test1 coreclrpal) - -target_link_libraries(paltest_wcslen_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp index ca2047b3c2d..df7613dcae2 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcslen_test1_paltest_wcslen_test1, "c_runtime/wcslen/test1/paltest_wcslen_test1") { WCHAR str1[] = {'f','o','o',' ',0}; WCHAR str2[] = {0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/testinfo.dat deleted file mode 100644 index baefcff664d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcslen/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcslen -Name = Positive Test for wcslen -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcslen correctly returns the length (in wide characters, not byte) -= of a wide string diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt deleted file mode 100644 index b730673d385..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsncmp_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsncmp_test1 coreclrpal) - -target_link_libraries(paltest_wcsncmp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp index 51ab8a37132..ff6a69e57f4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp @@ -20,7 +20,7 @@ * Notes: uses wcslen. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcsncmp_test1_paltest_wcsncmp_test1, "c_runtime/wcsncmp/test1/paltest_wcsncmp_test1") { WCHAR str1[] = {'f','o','o',0}; WCHAR str2[] = {'f','o','o','x',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/testinfo.dat deleted file mode 100644 index 4ff561aee84..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcsncmp -Name = Positive Test for wcsncmp -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcsncmp case-sensitively compares wide strings, making sure that -= the count argument is handled correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt deleted file mode 100644 index 8c70fdffaa1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsncpy_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsncpy_test1 coreclrpal) - -target_link_libraries(paltest_wcsncpy_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp index 85c531ff043..1d514672bc3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcsncpy_test1_paltest_wcsncpy_test1, "c_runtime/wcsncpy/test1/paltest_wcsncpy_test1") { WCHAR dest[80]; WCHAR result[] = {'f','o','o','b','a','r',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/testinfo.dat deleted file mode 100644 index 7bb0faaae94..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcsncpy -Name = Test #1 for wcsncpy -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests to see that wcsncpy correctly copies wide strings, including handling -= the count argument correctly (copying no more that count characters, not -= automatically adding a null, and padding if necessary). - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt deleted file mode 100644 index d2f75eacb99..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcspbrk_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcspbrk_test1 coreclrpal) - -target_link_libraries(paltest_wcspbrk_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp index 56773fce640..780d737d5b9 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcspbrk_test1_paltest_wcspbrk_test1, "c_runtime/wcspbrk/test1/paltest_wcspbrk_test1") { WCHAR *string; WCHAR *key1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/testinfo.dat deleted file mode 100644 index 281570d87e7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcspbrk -Name = Positive Test for wcspbrk -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcspbrk returns a pointer to the first element in the first -= string that matches a character in the second (or NULL). diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt deleted file mode 100644 index 931dcc01483..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsrchr_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsrchr_test1 coreclrpal) - -target_link_libraries(paltest_wcsrchr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp index fc28893ed0f..af2a58d158a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcsrchr_test1_paltest_wcsrchr_test1, "c_runtime/wcsrchr/test1/paltest_wcsrchr_test1") { WCHAR str[] = {'f','o','o',' ','b','a','r',' ','b','a','z',0}; WCHAR c = (WCHAR)' '; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/testinfo.dat deleted file mode 100644 index 8ed25b99e00..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcsrchr -Name = Positive Test for wcsrchr -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests to see that wcsrchr correctly returns a pointer to the last occurence -= of a character in a a string. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt deleted file mode 100644 index 2da56d9b777..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcsstr_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcsstr_test1 coreclrpal) - -target_link_libraries(paltest_wcsstr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp index ab41299982c..73264f6d127 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcsstr_test1_paltest_wcsstr_test1, "c_runtime/wcsstr/test1/paltest_wcsstr_test1") { WCHAR *string; WCHAR *key1; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/testinfo.dat deleted file mode 100644 index 3d3d5d1f90b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcsstr/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcsstr -Name = Positive Test for wcsstr -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that wcsstr correctly find substrings in wide stings, including -= returning NULL when the substring can't be found. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt deleted file mode 100644 index 1087e113907..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcstod_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcstod_test1 coreclrpal) - -target_link_libraries(paltest_wcstod_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp index d49c9038752..b1c1b9557c3 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp @@ -19,23 +19,23 @@ struct testCase int stopChar; }; -struct testCase testCases[] = +PALTEST(c_runtime_wcstod_test1_paltest_wcstod_test1, "c_runtime/wcstod/test1/paltest_wcstod_test1") { - {1234,"1234", 4}, - {-1234,"-1234", 5}, - {1234.44,"1234.44", 7}, - {1234e-5,"1234e-5", 7}, - {1234e+5,"1234e+5", 7}, - {1234E5,"1234E5", 6}, - {1234.657e-8, "1234.657e-8", 11}, - {0, "1e-800", 6}, - {0, "-1e-800", 7}, - {1234567e-8, " 1234567e-8 foo", 13}, - {0, " foo 32 bar", 0}, -}; + struct testCase testCases[] = + { + {1234,"1234", 4}, + {-1234,"-1234", 5}, + {1234.44,"1234.44", 7}, + {1234e-5,"1234e-5", 7}, + {1234e+5,"1234e+5", 7}, + {1234E5,"1234E5", 6}, + {1234.657e-8, "1234.657e-8", 11}, + {0, "1e-800", 6}, + {0, "-1e-800", 7}, + {1234567e-8, " 1234567e-8 foo", 13}, + {0, " foo 32 bar", 0}, + }; -int __cdecl main(int argc, char **argv) -{ WCHAR *wideStr; WCHAR *endptr; double result; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/testinfo.dat deleted file mode 100644 index 91eb1c62dd5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstod -Name = Positive Test for wcstod -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests wcstod with a number of sample strings. - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt deleted file mode 100644 index 76840320d27..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_wcstod_test2 - ${SOURCES} -) - -add_dependencies(paltest_wcstod_test2 coreclrpal) - -target_link_libraries(paltest_wcstod_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp index 3bd972c1b2d..8da0a902174 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(c_runtime_wcstod_test2_paltest_wcstod_test2, "c_runtime/wcstod/test2/paltest_wcstod_test2") { /* Representation of positive infinty for a IEEE 64-bit double */ INT64 PosInifity = (INT64)(0x7ff00000) << 32; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/testinfo.dat deleted file mode 100644 index 1aa32d0b01e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstod/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstod -Name = Positive Test for wcstod -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests wcstod with overflows - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt deleted file mode 100644 index 5e30ed3f64d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcstok_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcstok_test1 coreclrpal) - -target_link_libraries(paltest_wcstok_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp index 725669c36d5..564466c2a4e 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstok_test1_paltest_wcstok_test1, "c_runtime/wcstok/test1/paltest_wcstok_test1") { /* foo bar baz */ WCHAR str[] = {'f','o','o',' ','b','a','r',' ','b','a','z','\0'}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/testinfo.dat deleted file mode 100644 index f2861168075..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstok/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstok -Name = wcstok test- tokenize a string and ensure the string takes correct form. -TYPE = DEFAULT -EXE1 = test1 -Description -= Search for a number of tokens within strings. Check that the return values -= are what is expect, and also that the strings match up with our expected -= results. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt deleted file mode 100644 index 7157a2ae801..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wcstoul_test1 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test1 coreclrpal) - -target_link_libraries(paltest_wcstoul_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp index 190e05e373a..e985ca2103a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test1_paltest_wcstoul_test1, "c_runtime/wcstoul/test1/paltest_wcstoul_test1") { WCHAR teststr[] = {'1','2','3','4','5',0}; WCHAR *end; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/testinfo.dat deleted file mode 100644 index 1912c4332fb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests wcstoul with base 4 and a string that includes some invalid characters. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt deleted file mode 100644 index 30442349fbc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_wcstoul_test2 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test2 coreclrpal) - -target_link_libraries(paltest_wcstoul_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp index 5464ee32869..c1b74ca01c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test2_paltest_wcstoul_test2, "c_runtime/wcstoul/test2/paltest_wcstoul_test2") { WCHAR teststr[] = {'1','2','3','4','5',0}; WCHAR *end; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/testinfo.dat deleted file mode 100644 index 699cc4090a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests wcstoul with base 10 and a completely valid string. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt deleted file mode 100644 index 30de2310e93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_wcstoul_test3 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test3 coreclrpal) - -target_link_libraries(paltest_wcstoul_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp index 8e8916021d4..5c09075ce9f 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test3_paltest_wcstoul_test3, "c_runtime/wcstoul/test3/paltest_wcstoul_test3") { WCHAR str[] = {'Z',0}; WCHAR *end; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/testinfo.dat deleted file mode 100644 index c4671d63a09..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests wcstoul with a completely invalid string (base 10). diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt deleted file mode 100644 index 1be7efdc815..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_wcstoul_test4 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test4 coreclrpal) - -target_link_libraries(paltest_wcstoul_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp index 5aa380669cc..32055fb8bb5 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp @@ -16,7 +16,7 @@ * this is not currently tested. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test4_paltest_wcstoul_test4, "c_runtime/wcstoul/test4/paltest_wcstoul_test4") { WCHAR maxstr[] = {'4','2','9','4','9','6','7','2','9','5',0}; ULONG max = 4294967295ul; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/testinfo.dat deleted file mode 100644 index 2ae5a8b03f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests wcstoul with base 10 and the highest possible value. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt deleted file mode 100644 index fde5be4a19c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_wcstoul_test5 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test5 coreclrpal) - -target_link_libraries(paltest_wcstoul_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp index 0f9ce043c94..2ffab4b9de0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp @@ -17,7 +17,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test5_paltest_wcstoul_test5, "c_runtime/wcstoul/test5/paltest_wcstoul_test5") { WCHAR overstr[] = {'4','2','9','4','9','6','7','2','9','6',0}; WCHAR understr[] = {'-','1',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/testinfo.dat deleted file mode 100644 index 8f69b2ae947..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests wcstoul (base 10) with underflowing and overflowing. -= Chesks that errno gets set to ERANGE. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt deleted file mode 100644 index 199744cc3da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_wcstoul_test6 - ${SOURCES} -) - -add_dependencies(paltest_wcstoul_test6 coreclrpal) - -target_link_libraries(paltest_wcstoul_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp index 716dfef7cbd..8ffd4c0b314 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp @@ -19,7 +19,7 @@ */ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wcstoul_test6_paltest_wcstoul_test6, "c_runtime/wcstoul/test6/paltest_wcstoul_test6") { WCHAR test1[] = {'0','x','1','2', 0}; WCHAR test2[] = {'0','1','2',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/testinfo.dat deleted file mode 100644 index 255a584c901..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wcstoul/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wcstoul -Name = Positive Test for wcstoul -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests wcstoul with hex and octal strings, with different bases. diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt deleted file mode 100644 index 63b44d817f8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_wprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_wprintf_test1 coreclrpal) - -target_link_libraries(paltest_wprintf_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp index 22b459eabf6..75717a5e623 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> #include "../wprintf.h" -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wprintf_test1_paltest_wprintf_test1, "c_runtime/wprintf/test1/paltest_wprintf_test1") { char checkstr[] = "hello world"; WCHAR *wcheckstr; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/testinfo.dat deleted file mode 100644 index 5f807eee705..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wprintf -Name = Positive Test for wprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= General test to see if wprintf works correctly diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt deleted file mode 100644 index bd529b79977..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_wprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_wprintf_test2 coreclrpal) - -target_link_libraries(paltest_wprintf_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp index d1943902692..9f9dd0e6dc4 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp @@ -17,7 +17,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(c_runtime_wprintf_test2_paltest_wprintf_test2, "c_runtime/wprintf/test2/paltest_wprintf_test2") { if (PAL_Initialize(argc, argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/testinfo.dat deleted file mode 100644 index 7bbfe64e6cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = wprintf -Name = Positive Test for wprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests wprintf with strings diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h index 440d62c5a3e..aa7889e4fae 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h @@ -13,7 +13,7 @@ #ifndef __wprintf_H__ #define __wprintf_H__ -void DoStrTest(const WCHAR *formatstr, const WCHAR *param, const WCHAR *checkstr) +inline void DoStrTest_wprintf(const WCHAR *formatstr, const WCHAR *param, const WCHAR *checkstr) { int ret; @@ -24,9 +24,9 @@ void DoStrTest(const WCHAR *formatstr, const WCHAR *param, const WCHAR *checkstr wcslen(checkstr), ret); } } +#define DoStrTest DoStrTest_wprintf - -void DoPointerTest(const WCHAR *formatstr, void* param, WCHAR* paramstr, +inline void DoPointerTest_wprintf(const WCHAR *formatstr, void* param, WCHAR* paramstr, const WCHAR *checkstr1) { int ret; @@ -38,8 +38,9 @@ void DoPointerTest(const WCHAR *formatstr, void* param, WCHAR* paramstr, wcslen(checkstr1), ret); } } +#define DoPointerTest DoPointerTest_wprintf -void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) +inline void DoCountTest_wprintf(const WCHAR *formatstr, int param, const WCHAR *checkstr) { int ret; int n = -1; @@ -57,8 +58,9 @@ void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) wcslen(checkstr), ret); } } +#define DoCountTest DoCountTest_wprintf -void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) +inline void DoShortCountTest_wprintf(const WCHAR *formatstr, int param, const WCHAR *checkstr) { int ret; short int n = -1; @@ -76,9 +78,9 @@ void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) wcslen(checkstr), ret); } } +#define DoShortCountTest DoShortCountTest_wprintf - -void DoCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoCharTest_wprintf(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { int ret; @@ -89,8 +91,9 @@ void DoCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) wcslen(checkstr), ret); } } +#define DoCharTest DoCharTest_wprintf -void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) +inline void DoWCharTest_wprintf(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { int ret; @@ -101,8 +104,9 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) wcslen(checkstr), ret); } } +#define DoWCharTest DoWCharTest_wprintf -void DoNumTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) +inline void DoNumTest_wprintf(const WCHAR *formatstr, int param, const WCHAR *checkstr) { int ret; @@ -113,8 +117,9 @@ void DoNumTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) wcslen(checkstr), ret); } } +#define DoNumTest DoNumTest_wprintf -void DoI64Test(const WCHAR *formatstr, INT64 param, const WCHAR *valuestr, +inline void DoI64Test_wprintf(const WCHAR *formatstr, INT64 param, const WCHAR *valuestr, const WCHAR *checkstr1) { int ret; @@ -126,8 +131,9 @@ void DoI64Test(const WCHAR *formatstr, INT64 param, const WCHAR *valuestr, wcslen(checkstr1), ret); } } +#define DoI64Test DoI64Test_wprintf -void DoDoubleTest(const WCHAR *formatstr, double param, +inline void DoDoubleTest_wprintf(const WCHAR *formatstr, double param, const WCHAR *checkstr1, const WCHAR *checkstr2) { int ret; @@ -139,8 +145,9 @@ void DoDoubleTest(const WCHAR *formatstr, double param, wcslen(checkstr1), wcslen(checkstr2), ret); } } +#define DoDoubleTest DoDoubleTest_wprintf -void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, +inline void DoArgumentPrecTest_wprintf(const WCHAR *formatstr, int precision, void *param, WCHAR *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2) { int ret; @@ -152,8 +159,9 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, wcslen(checkstr1), wcslen(checkstr2), ret); } } +#define DoArgumentPrecTest DoArgumentPrecTest_wprintf -void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, +inline void DoArgumentPrecDoubleTest_wprintf(const WCHAR *formatstr, int precision, double param, const WCHAR *checkstr1, const WCHAR *checkstr2) { int ret; @@ -165,6 +173,7 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para wcslen(checkstr1), wcslen(checkstr2), ret); } } +#define DoArgumentPrecDoubleTest DoArgumentPrecDoubleTest_wprintf #endif diff --git a/src/coreclr/src/pal/tests/palsuite/common/palsuite.cpp b/src/coreclr/src/pal/tests/palsuite/common/palsuite.cpp new file mode 100644 index 00000000000..a3c2d718644 --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/common/palsuite.cpp @@ -0,0 +1,207 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +/*============================================================================ +** +** Source: palsuite.cpp +** +** Purpose: Define constants and implement functions that are useful to +** multiple function categories. +** +**==========================================================================*/ + + +#include "palsuite.h" + +const char* szTextFile = "text.txt"; + +HANDLE hToken[NUM_TOKENS]; +CRITICAL_SECTION CriticalSection; + +WCHAR* convert(const char * aString) +{ + int size; + WCHAR* wideBuffer; + + size = MultiByteToWideChar(CP_ACP,0,aString,-1,NULL,0); + wideBuffer = (WCHAR*) malloc(size*sizeof(WCHAR)); + if (wideBuffer == NULL) + { + Fail("ERROR: Unable to allocate memory!\n"); + } + MultiByteToWideChar(CP_ACP,0,aString,-1,wideBuffer,size); + return wideBuffer; +} + +char* convertC(const WCHAR * wString) +{ + int size; + char * MultiBuffer = NULL; + + size = WideCharToMultiByte(CP_ACP,0,wString,-1,MultiBuffer,0,NULL,NULL); + MultiBuffer = (char*) malloc(size); + if (MultiBuffer == NULL) + { + Fail("ERROR: Unable to allocate memory!\n"); + } + WideCharToMultiByte(CP_ACP,0,wString,-1,MultiBuffer,size,NULL,NULL); + return MultiBuffer; +} + +UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency) +{ + LARGE_INTEGER ts; + if (!QueryPerformanceCounter(&ts)) + { + Fail("ERROR: Unable to query performance counter!\n"); + } + + return ts.QuadPart / (performanceFrequency.QuadPart / 1000); +} + +static const char* rgchPathDelim = "\\"; + + +int +mkAbsoluteFilename( LPSTR dirName, + DWORD dwDirLength, + LPCSTR fileName, + DWORD dwFileLength, + LPSTR absPathName ) +{ + DWORD sizeDN, sizeFN, sizeAPN; + + sizeDN = strlen( dirName ); + sizeFN = strlen( fileName ); + sizeAPN = (sizeDN + 1 + sizeFN + 1); + + /* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ + if( sizeAPN > _MAX_PATH ) + { + return ( 0 ); + } + + strncpy( absPathName, dirName, dwDirLength +1 ); + strncpy( absPathName, rgchPathDelim, 2 ); + strncpy( absPathName, fileName, dwFileLength +1 ); + + return (sizeAPN); + +} + + +BOOL CleanupHelper (HANDLE *hArray, DWORD dwIndex) +{ + BOOL bCHRet; + + bCHRet = CloseHandle(hArray[dwIndex]); + if (!bCHRet) + { + Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " + "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], + GetLastError()); + } + + return (bCHRet); +} + +BOOL Cleanup(HANDLE *hArray, DWORD dwIndex) +{ + BOOL bCRet; + BOOL bCHRet = 0; + + while (--dwIndex > 0) + { + bCHRet = CleanupHelper(&hArray[0], dwIndex); + } + + bCRet = CloseHandle(hArray[0]); + if (!bCRet) + { + Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " + "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], + GetLastError()); + } + + return (bCRet&&bCHRet); +} + +/* + * Take two wide strings representing file and directory names + * (dirName, fileName), join the strings with the appropriate path + * delimiter and populate a wide character buffer (absPathName) with + * the resulting string. + * + * Returns: The number of wide characters in the resulting string. + * 0 is returned on Error. + */ +int +mkAbsoluteFilenameW ( + LPWSTR dirName, + DWORD dwDirLength, + LPCWSTR fileName, + DWORD dwFileLength, + LPWSTR absPathName ) +{ + const WCHAR szPathDelimW[] = {'\\','\0'}; + + DWORD sizeDN, sizeFN, sizeAPN; + + sizeDN = wcslen( dirName ); + sizeFN = wcslen( fileName ); + sizeAPN = (sizeDN + 1 + sizeFN + 1); + + /* insure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ + if ( sizeAPN > _MAX_PATH ) + { + return ( 0 ); + } + + wcsncpy(absPathName, dirName, dwDirLength +1); + wcsncpy(absPathName, szPathDelimW, 2); + wcsncpy(absPathName, fileName, dwFileLength +1); + + return (sizeAPN); + +} + +/* + * Take two wide strings representing file and directory names + * (dirName, fileName), join the strings with the appropriate path + * delimiter and populate a wide character buffer (absPathName) with + * the resulting string. + * + * Returns: The number of wide characters in the resulting string. + * 0 is returned on Error. + */ +int +mkAbsoluteFilenameA ( + LPSTR dirName, + DWORD dwDirLength, + LPCSTR fileName, + DWORD dwFileLength, + LPSTR absPathName ) +{ + const char *szPathDelimA = "\\"; + + DWORD sizeDN; + DWORD sizeFN; + DWORD sizeAPN; + + sizeDN = strlen( dirName ); + sizeFN = strlen( fileName ); + sizeAPN = (sizeDN + 1 + sizeFN + 1); + + /* insure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ + if ( sizeAPN > _MAX_PATH ) + { + return ( 0 ); + } + + strncpy(absPathName, dirName, dwDirLength +1); + strcat(absPathName, szPathDelimA); + strcat(absPathName, fileName); + + return (sizeAPN); + +} diff --git a/src/coreclr/src/pal/tests/palsuite/common/palsuite.h b/src/coreclr/src/pal/tests/palsuite/common/palsuite.h index 34bf3a5fa1a..d5e5a921ef1 100644 --- a/src/coreclr/src/pal/tests/palsuite/common/palsuite.h +++ b/src/coreclr/src/pal/tests/palsuite/common/palsuite.h @@ -24,14 +24,18 @@ typedef unsigned short char16_t; #include <pal.h> #include <palprivate.h> +#define PALTEST(testfunc, testname) \ + int __cdecl testfunc(int argc, char* argv[]); \ + static PALTest testfunc##_lookup(testfunc, testname); \ + int __cdecl testfunc(int argc, char* argv[]) \ + enum { PASS = 0, FAIL = 1 }; - -void Trace(const char *format, ...) +inline void Trace(const char *format, ...) { va_list arglist; @@ -42,7 +46,7 @@ void Trace(const char *format, ...) va_end(arglist); } -void Fail(const char *format, ...) +inline void Fail(const char *format, ...) { va_list arglist; @@ -57,6 +61,23 @@ void Fail(const char *format, ...) PAL_TerminateEx(FAIL); } +typedef int __cdecl(*PALTestEntrypoint)(int argc, char*[]); + +struct PALTest +{ + static PALTest* s_tests; + PALTest *_next; + PALTestEntrypoint _entrypoint; + const char *_name; + PALTest(PALTestEntrypoint entrypoint, const char *entrypointName) + { + _entrypoint = entrypoint; + _name = entrypointName; + _next = s_tests; + s_tests = this; + } +}; + #ifdef PAL_PERF int __cdecl Test_Main(int argc, char **argv); @@ -138,46 +159,65 @@ inline ULONG VAL32(ULONG x) #define _countof(_array) (sizeof(_array)/sizeof(_array[0])) -WCHAR* convert(const char * aString) -{ - int size; - WCHAR* wideBuffer; - - size = MultiByteToWideChar(CP_ACP,0,aString,-1,NULL,0); - wideBuffer = (WCHAR*) malloc(size*sizeof(WCHAR)); - if (wideBuffer == NULL) - { - Fail("ERROR: Unable to allocate memory!\n"); - } - MultiByteToWideChar(CP_ACP,0,aString,-1,wideBuffer,size); - return wideBuffer; -} - -char* convertC(const WCHAR * wString) -{ - int size; - char * MultiBuffer = NULL; - - size = WideCharToMultiByte(CP_ACP,0,wString,-1,MultiBuffer,0,NULL,NULL); - MultiBuffer = (char*) malloc(size); - if (MultiBuffer == NULL) - { - Fail("ERROR: Unable to allocate memory!\n"); - } - WideCharToMultiByte(CP_ACP,0,wString,-1,MultiBuffer,size,NULL,NULL); - return MultiBuffer; -} - -UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency) -{ - LARGE_INTEGER ts; - if (!QueryPerformanceCounter(&ts)) - { - Fail("ERROR: Unable to query performance counter!\n"); - } - - return ts.QuadPart / (performanceFrequency.QuadPart / 1000); -} +WCHAR* convert(const char * aString); +char* convertC(const WCHAR * wString); +UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency); + +extern const char* szTextFile; + + +int +mkAbsoluteFilename( LPSTR dirName, + DWORD dwDirLength, + LPCSTR fileName, + DWORD dwFileLength, + LPSTR absPathName ); + +BOOL CleanupHelper (HANDLE *hArray, DWORD dwIndex); +BOOL Cleanup(HANDLE *hArray, DWORD dwIndex); + + +/* + * Tokens 0 and 1 are events. Token 2 is the thread. + */ +#define NUM_TOKENS 3 + +extern HANDLE hToken[NUM_TOKENS]; +extern CRITICAL_SECTION CriticalSection; + +/* + * Take two wide strings representing file and directory names + * (dirName, fileName), join the strings with the appropriate path + * delimiter and populate a wide character buffer (absPathName) with + * the resulting string. + * + * Returns: The number of wide characters in the resulting string. + * 0 is returned on Error. + */ +int +mkAbsoluteFilenameW ( + LPWSTR dirName, + DWORD dwDirLength, + LPCWSTR fileName, + DWORD dwFileLength, + LPWSTR absPathName ); + +/* + * Take two wide strings representing file and directory names + * (dirName, fileName), join the strings with the appropriate path + * delimiter and populate a wide character buffer (absPathName) with + * the resulting string. + * + * Returns: The number of wide characters in the resulting string. + * 0 is returned on Error. + */ +int +mkAbsoluteFilenameA ( + LPSTR dirName, + DWORD dwDirLength, + LPCSTR fileName, + DWORD dwFileLength, + LPSTR absPathName ); #endif diff --git a/src/coreclr/src/pal/tests/palsuite/compilableTests.txt b/src/coreclr/src/pal/tests/palsuite/compilableTests.txt new file mode 100644 index 00000000000..2f754c48fdf --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/compilableTests.txt @@ -0,0 +1,804 @@ +c_runtime/abs/test1/paltest_abs_test1 +c_runtime/acos/test1/paltest_acos_test1 +c_runtime/acosf/test1/paltest_acosf_test1 +c_runtime/acosh/test1/paltest_acosh_test1 +c_runtime/acoshf/test1/paltest_acoshf_test1 +c_runtime/asin/test1/paltest_asin_test1 +c_runtime/asinf/test1/paltest_asinf_test1 +c_runtime/asinh/test1/paltest_asinh_test1 +c_runtime/asinhf/test1/paltest_asinhf_test1 +c_runtime/atan/test1/paltest_atan_test1 +c_runtime/atan2/test1/paltest_atan2_test1 +c_runtime/atan2f/test1/paltest_atan2f_test1 +c_runtime/atanf/test1/paltest_atanf_test1 +c_runtime/atanh/test1/paltest_atanh_test1 +c_runtime/atanhf/test1/paltest_atanhf_test1 +c_runtime/atof/test1/paltest_atof_test1 +c_runtime/atoi/test1/paltest_atoi_test1 +c_runtime/bsearch/test1/paltest_bsearch_test1 +c_runtime/bsearch/test2/paltest_bsearch_test2 +c_runtime/cbrt/test1/paltest_cbrt_test1 +c_runtime/cbrtf/test1/paltest_cbrtf_test1 +c_runtime/ceil/test1/paltest_ceil_test1 +c_runtime/ceilf/test1/paltest_ceilf_test1 +c_runtime/cos/test1/paltest_cos_test1 +c_runtime/cosf/test1/paltest_cosf_test1 +c_runtime/cosh/test1/paltest_cosh_test1 +c_runtime/coshf/test1/paltest_coshf_test1 +c_runtime/errno/test1/paltest_errno_test1 +c_runtime/errno/test2/paltest_errno_test2 +c_runtime/exit/test1/paltest_exit_test1 +c_runtime/exit/test2/paltest_exit_test2 +c_runtime/exp/test1/paltest_exp_test1 +c_runtime/expf/test1/paltest_expf_test1 +c_runtime/fabs/test1/paltest_fabs_test1 +c_runtime/fabsf/test1/paltest_fabsf_test1 +c_runtime/fclose/test1/paltest_fclose_test1 +c_runtime/fclose/test2/paltest_fclose_test2 +c_runtime/ferror/test1/paltest_ferror_test1 +c_runtime/ferror/test2/paltest_ferror_test2 +c_runtime/fflush/test1/paltest_fflush_test1 +c_runtime/fgets/test1/paltest_fgets_test1 +c_runtime/fgets/test2/paltest_fgets_test2 +c_runtime/fgets/test3/paltest_fgets_test3 +c_runtime/floor/test1/paltest_floor_test1 +c_runtime/floorf/test1/paltest_floorf_test1 +c_runtime/fma/test1/paltest_fma_test1 +c_runtime/fmaf/test1/paltest_fmaf_test1 +c_runtime/fmod/test1/paltest_fmod_test1 +c_runtime/fmodf/test1/paltest_fmodf_test1 +c_runtime/fopen/test1/paltest_fopen_test1 +c_runtime/fopen/test2/paltest_fopen_test2 +c_runtime/fopen/test3/paltest_fopen_test3 +c_runtime/fopen/test4/paltest_fopen_test4 +c_runtime/fopen/test5/paltest_fopen_test5 +c_runtime/fopen/test6/paltest_fopen_test6 +c_runtime/fopen/test7/paltest_fopen_test7 +c_runtime/fprintf/test1/paltest_fprintf_test1 +c_runtime/fprintf/test10/paltest_fprintf_test10 +c_runtime/fprintf/test11/paltest_fprintf_test11 +c_runtime/fprintf/test12/paltest_fprintf_test12 +c_runtime/fprintf/test13/paltest_fprintf_test13 +c_runtime/fprintf/test14/paltest_fprintf_test14 +c_runtime/fprintf/test15/paltest_fprintf_test15 +c_runtime/fprintf/test16/paltest_fprintf_test16 +c_runtime/fprintf/test17/paltest_fprintf_test17 +c_runtime/fprintf/test18/paltest_fprintf_test18 +c_runtime/fprintf/test19/paltest_fprintf_test19 +c_runtime/fprintf/test2/paltest_fprintf_test2 +c_runtime/fprintf/test3/paltest_fprintf_test3 +c_runtime/fprintf/test4/paltest_fprintf_test4 +c_runtime/fprintf/test5/paltest_fprintf_test5 +c_runtime/fprintf/test6/paltest_fprintf_test6 +c_runtime/fprintf/test7/paltest_fprintf_test7 +c_runtime/fprintf/test8/paltest_fprintf_test8 +c_runtime/fprintf/test9/paltest_fprintf_test9 +c_runtime/fputs/test1/paltest_fputs_test1 +c_runtime/fputs/test2/paltest_fputs_test2 +c_runtime/fread/test1/paltest_fread_test1 +c_runtime/fread/test2/paltest_fread_test2 +c_runtime/fread/test3/paltest_fread_test3 +c_runtime/free/test1/paltest_free_test1 +c_runtime/fseek/test1/paltest_fseek_test1 +c_runtime/ftell/test1/paltest_ftell_test1 +c_runtime/fwprintf/test1/paltest_fwprintf_test1 +c_runtime/fwprintf/test10/paltest_fwprintf_test10 +c_runtime/fwprintf/test11/paltest_fwprintf_test11 +c_runtime/fwprintf/test12/paltest_fwprintf_test12 +c_runtime/fwprintf/test13/paltest_fwprintf_test13 +c_runtime/fwprintf/test14/paltest_fwprintf_test14 +c_runtime/fwprintf/test15/paltest_fwprintf_test15 +c_runtime/fwprintf/test16/paltest_fwprintf_test16 +c_runtime/fwprintf/test17/paltest_fwprintf_test17 +c_runtime/fwprintf/test18/paltest_fwprintf_test18 +c_runtime/fwprintf/test19/paltest_fwprintf_test19 +c_runtime/fwprintf/test2/paltest_fwprintf_test2 +c_runtime/fwprintf/test3/paltest_fwprintf_test3 +c_runtime/fwprintf/test4/paltest_fwprintf_test4 +c_runtime/fwprintf/test5/paltest_fwprintf_test5 +c_runtime/fwprintf/test6/paltest_fwprintf_test6 +c_runtime/fwprintf/test7/paltest_fwprintf_test7 +c_runtime/fwprintf/test8/paltest_fwprintf_test8 +c_runtime/fwprintf/test9/paltest_fwprintf_test9 +c_runtime/fwrite/test1/paltest_fwrite_test1 +c_runtime/getenv/test1/paltest_getenv_test1 +c_runtime/getenv/test2/paltest_getenv_test2 +c_runtime/getenv/test3/paltest_getenv_test3 +c_runtime/ilogb/test1/paltest_ilogb_test1 +c_runtime/ilogbf/test1/paltest_ilogbf_test1 +c_runtime/isalnum/test1/paltest_isalnum_test1 +c_runtime/isalpha/test1/paltest_isalpha_test1 +c_runtime/isdigit/test1/paltest_isdigit_test1 +c_runtime/islower/test1/paltest_islower_test1 +c_runtime/isprint/test1/paltest_isprint_test1 +c_runtime/isprint/test2/paltest_isprint_test2 +c_runtime/isspace/test1/paltest_isspace_test1 +c_runtime/isupper/test1/paltest_isupper_test1 +c_runtime/iswdigit/test1/paltest_iswdigit_test1 +c_runtime/iswspace/test1/paltest_iswspace_test1 +c_runtime/iswupper/test1/paltest_iswupper_test1 +c_runtime/isxdigit/test1/paltest_isxdigit_test1 +c_runtime/llabs/test1/paltest_llabs_test1 +c_runtime/log/test1/paltest_log_test1 +c_runtime/log10/test1/paltest_log10_test1 +c_runtime/log10f/test1/paltest_log10f_test1 +c_runtime/log2/test1/paltest_log2_test1 +c_runtime/log2f/test1/paltest_log2f_test1 +c_runtime/logf/test1/paltest_logf_test1 +c_runtime/malloc/test1/paltest_malloc_test1 +c_runtime/malloc/test2/paltest_malloc_test2 +c_runtime/memchr/test1/paltest_memchr_test1 +c_runtime/memcmp/test1/paltest_memcmp_test1 +c_runtime/memcpy/test1/paltest_memcpy_test1 +c_runtime/memmove/test1/paltest_memmove_test1 +c_runtime/memset/test1/paltest_memset_test1 +c_runtime/modf/test1/paltest_modf_test1 +c_runtime/modff/test1/paltest_modff_test1 +c_runtime/pow/test1/paltest_pow_test1 +c_runtime/powf/test1/paltest_powf_test1 +c_runtime/printf/test1/paltest_printf_test1 +c_runtime/printf/test10/paltest_printf_test10 +c_runtime/printf/test11/paltest_printf_test11 +c_runtime/printf/test12/paltest_printf_test12 +c_runtime/printf/test13/paltest_printf_test13 +c_runtime/printf/test14/paltest_printf_test14 +c_runtime/printf/test15/paltest_printf_test15 +c_runtime/printf/test16/paltest_printf_test16 +c_runtime/printf/test17/paltest_printf_test17 +c_runtime/printf/test18/paltest_printf_test18 +c_runtime/printf/test19/paltest_printf_test19 +c_runtime/printf/test2/paltest_printf_test2 +c_runtime/printf/test3/paltest_printf_test3 +c_runtime/printf/test4/paltest_printf_test4 +c_runtime/printf/test5/paltest_printf_test5 +c_runtime/printf/test6/paltest_printf_test6 +c_runtime/printf/test7/paltest_printf_test7 +c_runtime/printf/test8/paltest_printf_test8 +c_runtime/printf/test9/paltest_printf_test9 +c_runtime/qsort/test1/paltest_qsort_test1 +c_runtime/qsort/test2/paltest_qsort_test2 +c_runtime/rand_srand/test1/paltest_rand_srand_test1 +c_runtime/realloc/test1/paltest_realloc_test1 +c_runtime/scalbn/test1/paltest_scalbn_test1 +c_runtime/scalbnf/test1/paltest_scalbnf_test1 +c_runtime/sin/test1/paltest_sin_test1 +c_runtime/sinf/test1/paltest_sinf_test1 +c_runtime/sinh/test1/paltest_sinh_test1 +c_runtime/sinhf/test1/paltest_sinhf_test1 +c_runtime/sprintf_s/test1/paltest_sprintf_test1 +c_runtime/sprintf_s/test10/paltest_sprintf_test10 +c_runtime/sprintf_s/test11/paltest_sprintf_test11 +c_runtime/sprintf_s/test12/paltest_sprintf_test12 +c_runtime/sprintf_s/test13/paltest_sprintf_test13 +c_runtime/sprintf_s/test14/paltest_sprintf_test14 +c_runtime/sprintf_s/test15/paltest_sprintf_test15 +c_runtime/sprintf_s/test16/paltest_sprintf_test16 +c_runtime/sprintf_s/test17/paltest_sprintf_test17 +c_runtime/sprintf_s/test18/paltest_sprintf_test18 +c_runtime/sprintf_s/test19/paltest_sprintf_test19 +c_runtime/sprintf_s/test2/paltest_sprintf_test2 +c_runtime/sprintf_s/test3/paltest_sprintf_test3 +c_runtime/sprintf_s/test4/paltest_sprintf_test4 +c_runtime/sprintf_s/test6/paltest_sprintf_test6 +c_runtime/sprintf_s/test7/paltest_sprintf_test7 +c_runtime/sprintf_s/test8/paltest_sprintf_test8 +c_runtime/sprintf_s/test9/paltest_sprintf_test9 +c_runtime/sqrt/test1/paltest_sqrt_test1 +c_runtime/sqrtf/test1/paltest_sqrtf_test1 +c_runtime/sscanf_s/test1/paltest_sscanf_test1 +c_runtime/sscanf_s/test10/paltest_sscanf_test10 +c_runtime/sscanf_s/test11/paltest_sscanf_test11 +c_runtime/sscanf_s/test12/paltest_sscanf_test12 +c_runtime/sscanf_s/test13/paltest_sscanf_test13 +c_runtime/sscanf_s/test14/paltest_sscanf_test14 +c_runtime/sscanf_s/test15/paltest_sscanf_test15 +c_runtime/sscanf_s/test16/paltest_sscanf_test16 +c_runtime/sscanf_s/test17/paltest_sscanf_test17 +c_runtime/sscanf_s/test2/paltest_sscanf_test2 +c_runtime/sscanf_s/test3/paltest_sscanf_test3 +c_runtime/sscanf_s/test4/paltest_sscanf_test4 +c_runtime/sscanf_s/test5/paltest_sscanf_test5 +c_runtime/sscanf_s/test6/paltest_sscanf_test6 +c_runtime/sscanf_s/test7/paltest_sscanf_test7 +c_runtime/sscanf_s/test8/paltest_sscanf_test8 +c_runtime/sscanf_s/test9/paltest_sscanf_test9 +c_runtime/strcat/test1/paltest_strcat_test1 +c_runtime/strchr/test1/paltest_strchr_test1 +c_runtime/strcmp/test1/paltest_strcmp_test1 +c_runtime/strcpy/test1/paltest_strcpy_test1 +c_runtime/strcspn/test1/paltest_strcspn_test1 +c_runtime/strlen/test1/paltest_strlen_test1 +c_runtime/strncat/test1/paltest_strncat_test1 +c_runtime/strncmp/test1/paltest_strncmp_test1 +c_runtime/strncpy/test1/paltest_strncpy_test1 +c_runtime/strpbrk/test1/paltest_strpbrk_test1 +c_runtime/strrchr/test1/paltest_strrchr_test1 +c_runtime/strspn/test1/paltest_strspn_test1 +c_runtime/strstr/test1/paltest_strstr_test1 +c_runtime/strtod/test1/paltest_strtod_test1 +c_runtime/strtod/test2/paltest_strtod_test2 +c_runtime/strtok/test1/paltest_strtok_test1 +c_runtime/strtoul/test1/paltest_strtoul_test1 +c_runtime/swprintf/test1/paltest_swprintf_test1 +c_runtime/swprintf/test10/paltest_swprintf_test10 +c_runtime/swprintf/test11/paltest_swprintf_test11 +c_runtime/swprintf/test12/paltest_swprintf_test12 +c_runtime/swprintf/test13/paltest_swprintf_test13 +c_runtime/swprintf/test14/paltest_swprintf_test14 +c_runtime/swprintf/test15/paltest_swprintf_test15 +c_runtime/swprintf/test16/paltest_swprintf_test16 +c_runtime/swprintf/test17/paltest_swprintf_test17 +c_runtime/swprintf/test18/paltest_swprintf_test18 +c_runtime/swprintf/test19/paltest_swprintf_test19 +c_runtime/swprintf/test2/paltest_swprintf_test2 +c_runtime/swprintf/test3/paltest_swprintf_test3 +c_runtime/swprintf/test4/paltest_swprintf_test4 +c_runtime/swprintf/test6/paltest_swprintf_test6 +c_runtime/swprintf/test7/paltest_swprintf_test7 +c_runtime/swprintf/test8/paltest_swprintf_test8 +c_runtime/swprintf/test9/paltest_swprintf_test9 +c_runtime/swscanf/test1/paltest_swscanf_test1 +c_runtime/swscanf/test10/paltest_swscanf_test10 +c_runtime/swscanf/test11/paltest_swscanf_test11 +c_runtime/swscanf/test12/paltest_swscanf_test12 +c_runtime/swscanf/test13/paltest_swscanf_test13 +c_runtime/swscanf/test14/paltest_swscanf_test14 +c_runtime/swscanf/test15/paltest_swscanf_test15 +c_runtime/swscanf/test16/paltest_swscanf_test16 +c_runtime/swscanf/test17/paltest_swscanf_test17 +c_runtime/swscanf/test2/paltest_swscanf_test2 +c_runtime/swscanf/test3/paltest_swscanf_test3 +c_runtime/swscanf/test4/paltest_swscanf_test4 +c_runtime/swscanf/test5/paltest_swscanf_test5 +c_runtime/swscanf/test6/paltest_swscanf_test6 +c_runtime/swscanf/test7/paltest_swscanf_test7 +c_runtime/swscanf/test8/paltest_swscanf_test8 +c_runtime/swscanf/test9/paltest_swscanf_test9 +c_runtime/tan/test1/paltest_tan_test1 +c_runtime/tanf/test1/paltest_tanf_test1 +c_runtime/tanh/test1/paltest_tanh_test1 +c_runtime/tanhf/test1/paltest_tanhf_test1 +c_runtime/time/test1/paltest_time_test1 +c_runtime/tolower/test1/paltest_tolower_test1 +c_runtime/toupper/test1/paltest_toupper_test1 +c_runtime/towlower/test1/paltest_towlower_test1 +c_runtime/towupper/test1/paltest_towupper_test1 +c_runtime/vfprintf/test1/paltest_vfprintf_test1 +c_runtime/vfprintf/test10/paltest_vfprintf_test10 +c_runtime/vfprintf/test11/paltest_vfprintf_test11 +c_runtime/vfprintf/test12/paltest_vfprintf_test12 +c_runtime/vfprintf/test13/paltest_vfprintf_test13 +c_runtime/vfprintf/test14/paltest_vfprintf_test14 +c_runtime/vfprintf/test15/paltest_vfprintf_test15 +c_runtime/vfprintf/test16/paltest_vfprintf_test16 +c_runtime/vfprintf/test17/paltest_vfprintf_test17 +c_runtime/vfprintf/test18/paltest_vfprintf_test18 +c_runtime/vfprintf/test19/paltest_vfprintf_test19 +c_runtime/vfprintf/test2/paltest_vfprintf_test2 +c_runtime/vfprintf/test3/paltest_vfprintf_test3 +c_runtime/vfprintf/test4/paltest_vfprintf_test4 +c_runtime/vfprintf/test5/paltest_vfprintf_test5 +c_runtime/vfprintf/test6/paltest_vfprintf_test6 +c_runtime/vfprintf/test7/paltest_vfprintf_test7 +c_runtime/vfprintf/test8/paltest_vfprintf_test8 +c_runtime/vfprintf/test9/paltest_vfprintf_test9 +c_runtime/vprintf/test10/paltest_vprintf_test10 +c_runtime/vprintf/test11/paltest_vprintf_test11 +c_runtime/vprintf/test12/paltest_vprintf_test12 +c_runtime/vprintf/test13/paltest_vprintf_test13 +c_runtime/vprintf/test14/paltest_vprintf_test14 +c_runtime/vprintf/test15/paltest_vprintf_test15 +c_runtime/vprintf/test16/paltest_vprintf_test16 +c_runtime/vprintf/test17/paltest_vprintf_test17 +c_runtime/vprintf/test18/paltest_vprintf_test18 +c_runtime/vprintf/test19/paltest_vprintf_test19 +c_runtime/vprintf/test2/paltest_vprintf_test2 +c_runtime/vprintf/test3/paltest_vprintf_test3 +c_runtime/vprintf/test4/paltest_vprintf_test4 +c_runtime/vprintf/test5/paltest_vprintf_test5 +c_runtime/vprintf/test6/paltest_vprintf_test6 +c_runtime/vprintf/test7/paltest_vprintf_test7 +c_runtime/vprintf/test8/paltest_vprintf_test8 +c_runtime/vprintf/test9/paltest_vprintf_test9 +c_runtime/vsprintf/test1/paltest_vsprintf_test1 +c_runtime/vsprintf/test10/paltest_vsprintf_test10 +c_runtime/vsprintf/test11/paltest_vsprintf_test11 +c_runtime/vsprintf/test12/paltest_vsprintf_test12 +c_runtime/vsprintf/test13/paltest_vsprintf_test13 +c_runtime/vsprintf/test14/paltest_vsprintf_test14 +c_runtime/vsprintf/test15/paltest_vsprintf_test15 +c_runtime/vsprintf/test16/paltest_vsprintf_test16 +c_runtime/vsprintf/test17/paltest_vsprintf_test17 +c_runtime/vsprintf/test18/paltest_vsprintf_test18 +c_runtime/vsprintf/test19/paltest_vsprintf_test19 +c_runtime/vsprintf/test2/paltest_vsprintf_test2 +c_runtime/vsprintf/test3/paltest_vsprintf_test3 +c_runtime/vsprintf/test4/paltest_vsprintf_test4 +c_runtime/vsprintf/test6/paltest_vsprintf_test6 +c_runtime/vsprintf/test7/paltest_vsprintf_test7 +c_runtime/vsprintf/test8/paltest_vsprintf_test8 +c_runtime/vsprintf/test9/paltest_vsprintf_test9 +c_runtime/vswprintf/test1/paltest_vswprintf_test1 +c_runtime/vswprintf/test10/paltest_vswprintf_test10 +c_runtime/vswprintf/test11/paltest_vswprintf_test11 +c_runtime/vswprintf/test12/paltest_vswprintf_test12 +c_runtime/vswprintf/test13/paltest_vswprintf_test13 +c_runtime/vswprintf/test14/paltest_vswprintf_test14 +c_runtime/vswprintf/test15/paltest_vswprintf_test15 +c_runtime/vswprintf/test16/paltest_vswprintf_test16 +c_runtime/vswprintf/test17/paltest_vswprintf_test17 +c_runtime/vswprintf/test18/paltest_vswprintf_test18 +c_runtime/vswprintf/test19/paltest_vswprintf_test19 +c_runtime/vswprintf/test2/paltest_vswprintf_test2 +c_runtime/vswprintf/test3/paltest_vswprintf_test3 +c_runtime/vswprintf/test4/paltest_vswprintf_test4 +c_runtime/vswprintf/test6/paltest_vswprintf_test6 +c_runtime/vswprintf/test7/paltest_vswprintf_test7 +c_runtime/vswprintf/test8/paltest_vswprintf_test8 +c_runtime/vswprintf/test9/paltest_vswprintf_test9 +c_runtime/wcscat/test1/paltest_wcscat_test1 +c_runtime/wcschr/test1/paltest_wcschr_test1 +c_runtime/wcscmp/test1/paltest_wcscmp_test1 +c_runtime/wcscpy/test1/paltest_wcscpy_test1 +c_runtime/wcslen/test1/paltest_wcslen_test1 +c_runtime/wcsncmp/test1/paltest_wcsncmp_test1 +c_runtime/wcsncpy/test1/paltest_wcsncpy_test1 +c_runtime/wcspbrk/test1/paltest_wcspbrk_test1 +c_runtime/wcsrchr/test1/paltest_wcsrchr_test1 +c_runtime/wcsstr/test1/paltest_wcsstr_test1 +c_runtime/wcstod/test1/paltest_wcstod_test1 +c_runtime/wcstod/test2/paltest_wcstod_test2 +c_runtime/wcstok/test1/paltest_wcstok_test1 +c_runtime/wcstoul/test1/paltest_wcstoul_test1 +c_runtime/wcstoul/test2/paltest_wcstoul_test2 +c_runtime/wcstoul/test3/paltest_wcstoul_test3 +c_runtime/wcstoul/test4/paltest_wcstoul_test4 +c_runtime/wcstoul/test5/paltest_wcstoul_test5 +c_runtime/wcstoul/test6/paltest_wcstoul_test6 +c_runtime/wprintf/test1/paltest_wprintf_test1 +c_runtime/wprintf/test2/paltest_wprintf_test2 +c_runtime/_alloca/test1/paltest_alloca_test1 +c_runtime/_fdopen/test1/paltest_fdopen_test1 +c_runtime/_finite/test1/paltest_finite_test1 +c_runtime/_finitef/test1/paltest_finitef_test1 +c_runtime/_isnan/test1/paltest_isnan_test1 +c_runtime/_isnanf/test1/paltest_isnanf_test1 +c_runtime/_itow/test1/paltest_itow_test1 +c_runtime/_putenv/test1/paltest_putenv_test1 +c_runtime/_putenv/test2/paltest_putenv_test2 +c_runtime/_putenv/test3/paltest_putenv_test3 +c_runtime/_putenv/test4/paltest_putenv_test4 +c_runtime/_rotl/test1/paltest_rotl_test1 +c_runtime/_rotr/test1/paltest_rotr_test1 +c_runtime/_snprintf_s/test1/paltest_snprintf_test1 +c_runtime/_snprintf_s/test10/paltest_snprintf_test10 +c_runtime/_snprintf_s/test11/paltest_snprintf_test11 +c_runtime/_snprintf_s/test12/paltest_snprintf_test12 +c_runtime/_snprintf_s/test13/paltest_snprintf_test13 +c_runtime/_snprintf_s/test14/paltest_snprintf_test14 +c_runtime/_snprintf_s/test15/paltest_snprintf_test15 +c_runtime/_snprintf_s/test16/paltest_snprintf_test16 +c_runtime/_snprintf_s/test17/paltest_snprintf_test17 +c_runtime/_snprintf_s/test18/paltest_snprintf_test18 +c_runtime/_snprintf_s/test19/paltest_snprintf_test19 +c_runtime/_snprintf_s/test2/paltest_snprintf_test2 +c_runtime/_snprintf_s/test3/paltest_snprintf_test3 +c_runtime/_snprintf_s/test4/paltest_snprintf_test4 +c_runtime/_snprintf_s/test6/paltest_snprintf_test6 +c_runtime/_snprintf_s/test7/paltest_snprintf_test7 +c_runtime/_snprintf_s/test8/paltest_snprintf_test8 +c_runtime/_snprintf_s/test9/paltest_snprintf_test9 +c_runtime/_snwprintf_s/test1/paltest_snwprintf_test1 +c_runtime/_snwprintf_s/test10/paltest_snwprintf_test10 +c_runtime/_snwprintf_s/test11/paltest_snwprintf_test11 +c_runtime/_snwprintf_s/test12/paltest_snwprintf_test12 +c_runtime/_snwprintf_s/test13/paltest_snwprintf_test13 +c_runtime/_snwprintf_s/test14/paltest_snwprintf_test14 +c_runtime/_snwprintf_s/test15/paltest_snwprintf_test15 +c_runtime/_snwprintf_s/test16/paltest_snwprintf_test16 +c_runtime/_snwprintf_s/test17/paltest_snwprintf_test17 +c_runtime/_snwprintf_s/test18/paltest_snwprintf_test18 +c_runtime/_snwprintf_s/test19/paltest_snwprintf_test19 +c_runtime/_snwprintf_s/test2/paltest_snwprintf_test2 +c_runtime/_snwprintf_s/test3/paltest_snwprintf_test3 +c_runtime/_snwprintf_s/test4/paltest_snwprintf_test4 +c_runtime/_snwprintf_s/test6/paltest_snwprintf_test6 +c_runtime/_snwprintf_s/test7/paltest_snwprintf_test7 +c_runtime/_snwprintf_s/test8/paltest_snwprintf_test8 +c_runtime/_snwprintf_s/test9/paltest_snwprintf_test9 +c_runtime/_stricmp/test1/paltest_stricmp_test1 +c_runtime/_strnicmp/test1/paltest_strnicmp_test1 +c_runtime/_vsnprintf_s/test1/paltest_vsnprintf_test1 +c_runtime/_vsnprintf_s/test10/paltest_vsnprintf_test10 +c_runtime/_vsnprintf_s/test11/paltest_vsnprintf_test11 +c_runtime/_vsnprintf_s/test12/paltest_vsnprintf_test12 +c_runtime/_vsnprintf_s/test13/paltest_vsnprintf_test13 +c_runtime/_vsnprintf_s/test14/paltest_vsnprintf_test14 +c_runtime/_vsnprintf_s/test15/paltest_vsnprintf_test15 +c_runtime/_vsnprintf_s/test16/paltest_vsnprintf_test16 +c_runtime/_vsnprintf_s/test17/paltest_vsnprintf_test17 +c_runtime/_vsnprintf_s/test18/paltest_vsnprintf_test18 +c_runtime/_vsnprintf_s/test19/paltest_vsnprintf_test19 +c_runtime/_vsnprintf_s/test2/paltest_vsnprintf_test2 +c_runtime/_vsnprintf_s/test3/paltest_vsnprintf_test3 +c_runtime/_vsnprintf_s/test4/paltest_vsnprintf_test4 +c_runtime/_vsnprintf_s/test6/paltest_vsnprintf_test6 +c_runtime/_vsnprintf_s/test7/paltest_vsnprintf_test7 +c_runtime/_vsnprintf_s/test8/paltest_vsnprintf_test8 +c_runtime/_vsnprintf_s/test9/paltest_vsnprintf_test9 +c_runtime/_vsnwprintf_s/test1/paltest_vsnwprintf_test1 +c_runtime/_vsnwprintf_s/test10/paltest_vsnwprintf_test10 +c_runtime/_vsnwprintf_s/test11/paltest_vsnwprintf_test11 +c_runtime/_vsnwprintf_s/test12/paltest_vsnwprintf_test12 +c_runtime/_vsnwprintf_s/test13/paltest_vsnwprintf_test13 +c_runtime/_vsnwprintf_s/test14/paltest_vsnwprintf_test14 +c_runtime/_vsnwprintf_s/test15/paltest_vsnwprintf_test15 +c_runtime/_vsnwprintf_s/test16/paltest_vsnwprintf_test16 +c_runtime/_vsnwprintf_s/test17/paltest_vsnwprintf_test17 +c_runtime/_vsnwprintf_s/test18/paltest_vsnwprintf_test18 +c_runtime/_vsnwprintf_s/test19/paltest_vsnwprintf_test19 +c_runtime/_vsnwprintf_s/test2/paltest_vsnwprintf_test2 +c_runtime/_vsnwprintf_s/test3/paltest_vsnwprintf_test3 +c_runtime/_vsnwprintf_s/test4/paltest_vsnwprintf_test4 +c_runtime/_vsnwprintf_s/test6/paltest_vsnwprintf_test6 +c_runtime/_vsnwprintf_s/test7/paltest_vsnwprintf_test7 +c_runtime/_vsnwprintf_s/test8/paltest_vsnwprintf_test8 +c_runtime/_vsnwprintf_s/test9/paltest_vsnwprintf_test9 +c_runtime/_wcsicmp/test1/paltest_wcsicmp_test1 +c_runtime/_wcslwr/test1/paltest_wcslwr_test1 +c_runtime/_wcsnicmp/test1/paltest_wcsnicmp_test1 +c_runtime/_wfopen/test1/paltest_wfopen_test1 +c_runtime/_wfopen/test2/paltest_wfopen_test2 +c_runtime/_wfopen/test3/paltest_wfopen_test3 +c_runtime/_wfopen/test4/paltest_wfopen_test4 +c_runtime/_wfopen/test5/paltest_wfopen_test5 +c_runtime/_wfopen/test6/paltest_wfopen_test6 +c_runtime/_wfopen/test7/paltest_wfopen_test7 +c_runtime/_wtoi/test1/paltest_wtoi_test1 +c_runtime/__iscsym/test1/paltest_iscsym_test1 +debug_api/OutputDebugStringA/test1/paltest_outputdebugstringa_test1 +debug_api/OutputDebugStringW/test1/paltest_outputdebugstringw_test1 +exception_handling/RaiseException/test1/paltest_raiseexception_test1 +exception_handling/RaiseException/test2/paltest_raiseexception_test2 +exception_handling/RaiseException/test3/paltest_raiseexception_test3 +filemapping_memmgt/CreateFileMappingA/test1/paltest_createfilemappinga_test1 +filemapping_memmgt/CreateFileMappingA/test3/paltest_createfilemappinga_test3 +filemapping_memmgt/CreateFileMappingA/test4/paltest_createfilemappinga_test4 +filemapping_memmgt/CreateFileMappingA/test5/paltest_createfilemappinga_test5 +filemapping_memmgt/CreateFileMappingA/test6/paltest_createfilemappinga_test6 +filemapping_memmgt/CreateFileMappingA/test7/paltest_createfilemappinga_test7 +filemapping_memmgt/CreateFileMappingA/test8/paltest_createfilemappinga_test8 +filemapping_memmgt/CreateFileMappingA/test9/paltest_createfilemappinga_test9 +filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/paltest_createfilemappingw_createfilemapping_neg1 +filemapping_memmgt/CreateFileMappingW/test1/paltest_createfilemappingw_test1 +filemapping_memmgt/CreateFileMappingW/test3/paltest_createfilemappingw_test3 +filemapping_memmgt/CreateFileMappingW/test4/paltest_createfilemappingw_test4 +filemapping_memmgt/CreateFileMappingW/test5/paltest_createfilemappingw_test5 +filemapping_memmgt/CreateFileMappingW/test6/paltest_createfilemappingw_test6 +filemapping_memmgt/CreateFileMappingW/test7/paltest_createfilemappingw_test7 +filemapping_memmgt/CreateFileMappingW/test8/paltest_createfilemappingw_test8 +filemapping_memmgt/CreateFileMappingW/test9/paltest_createfilemappingw_test9 +filemapping_memmgt/FreeLibrary/test1/paltest_freelibrary_test1 +filemapping_memmgt/FreeLibrary/test2/paltest_freelibrary_test2 +filemapping_memmgt/FreeLibraryAndExitThread/test1/paltest_freelibraryandexitthread_test1 +filemapping_memmgt/GetModuleFileNameA/test1/paltest_getmodulefilenamea_test1 +filemapping_memmgt/GetModuleFileNameA/test2/paltest_getmodulefilenamea_test2 +filemapping_memmgt/GetModuleFileNameW/test1/paltest_getmodulefilenamew_test1 +filemapping_memmgt/GetModuleFileNameW/test2/paltest_getmodulefilenamew_test2 +filemapping_memmgt/GetProcAddress/test1/paltest_getprocaddress_test1 +filemapping_memmgt/GetProcAddress/test2/paltest_getprocaddress_test2 +filemapping_memmgt/LocalAlloc/test1/paltest_localalloc_test1 +filemapping_memmgt/LocalFree/test1/paltest_localfree_test1 +filemapping_memmgt/LocalFree/test2/paltest_localfree_test2 +filemapping_memmgt/MapViewOfFile/test1/paltest_mapviewoffile_test1 +filemapping_memmgt/MapViewOfFile/test2/paltest_mapviewoffile_test2 +filemapping_memmgt/MapViewOfFile/test3/paltest_mapviewoffile_test3 +filemapping_memmgt/MapViewOfFile/test4/paltest_mapviewoffile_test4 +filemapping_memmgt/MapViewOfFile/test5/paltest_mapviewoffile_test5 +filemapping_memmgt/MapViewOfFile/test6/paltest_mapviewoffile_test6 +filemapping_memmgt/OpenFileMappingA/test1/paltest_openfilemappinga_test1 +filemapping_memmgt/OpenFileMappingA/test2/paltest_openfilemappinga_test2 +filemapping_memmgt/OpenFileMappingA/test3/paltest_openfilemappinga_test3 +filemapping_memmgt/OpenFileMappingW/test1/paltest_openfilemappingw_test1 +filemapping_memmgt/OpenFileMappingW/test2/paltest_openfilemappingw_test2 +filemapping_memmgt/OpenFileMappingW/test3/paltest_openfilemappingw_test3 +filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/paltest_probememory_probememory_neg1 +filemapping_memmgt/ProbeMemory/test1/paltest_probememory_test1 +filemapping_memmgt/UnmapViewOfFile/test1/paltest_unmapviewoffile_test1 +filemapping_memmgt/UnmapViewOfFile/test2/paltest_unmapviewoffile_test2 +filemapping_memmgt/VirtualAlloc/test1/paltest_virtualalloc_test1 +filemapping_memmgt/VirtualAlloc/test10/paltest_virtualalloc_test10 +filemapping_memmgt/VirtualAlloc/test11/paltest_virtualalloc_test11 +filemapping_memmgt/VirtualAlloc/test12/paltest_virtualalloc_test12 +filemapping_memmgt/VirtualAlloc/test13/paltest_virtualalloc_test13 +filemapping_memmgt/VirtualAlloc/test14/paltest_virtualalloc_test14 +filemapping_memmgt/VirtualAlloc/test15/paltest_virtualalloc_test15 +filemapping_memmgt/VirtualAlloc/test16/paltest_virtualalloc_test16 +filemapping_memmgt/VirtualAlloc/test17/paltest_virtualalloc_test17 +filemapping_memmgt/VirtualAlloc/test18/paltest_virtualalloc_test18 +filemapping_memmgt/VirtualAlloc/test19/paltest_virtualalloc_test19 +filemapping_memmgt/VirtualAlloc/test2/paltest_virtualalloc_test2 +filemapping_memmgt/VirtualAlloc/test20/paltest_virtualalloc_test20 +filemapping_memmgt/VirtualAlloc/test21/paltest_virtualalloc_test21 +filemapping_memmgt/VirtualAlloc/test22/paltest_virtualalloc_test22 +filemapping_memmgt/VirtualAlloc/test3/paltest_virtualalloc_test3 +filemapping_memmgt/VirtualAlloc/test4/paltest_virtualalloc_test4 +filemapping_memmgt/VirtualAlloc/test5/paltest_virtualalloc_test5 +filemapping_memmgt/VirtualAlloc/test6/paltest_virtualalloc_test6 +filemapping_memmgt/VirtualAlloc/test7/paltest_virtualalloc_test7 +filemapping_memmgt/VirtualAlloc/test8/paltest_virtualalloc_test8 +filemapping_memmgt/VirtualAlloc/test9/paltest_virtualalloc_test9 +filemapping_memmgt/VirtualFree/test1/paltest_virtualfree_test1 +filemapping_memmgt/VirtualFree/test2/paltest_virtualfree_test2 +filemapping_memmgt/VirtualFree/test3/paltest_virtualfree_test3 +filemapping_memmgt/VirtualProtect/test1/paltest_virtualprotect_test1 +filemapping_memmgt/VirtualProtect/test2/paltest_virtualprotect_test2 +filemapping_memmgt/VirtualProtect/test3/paltest_virtualprotect_test3 +filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4 +filemapping_memmgt/VirtualProtect/test6/paltest_virtualprotect_test6 +filemapping_memmgt/VirtualProtect/test7/paltest_virtualprotect_test7 +filemapping_memmgt/VirtualQuery/test1/paltest_virtualquery_test1 +file_io/CopyFileA/test1/paltest_copyfilea_test1 +file_io/CopyFileA/test2/paltest_copyfilea_test2 +file_io/CopyFileA/test3/paltest_copyfilea_test3 +file_io/CopyFileA/test4/paltest_copyfilea_test4 +file_io/CopyFileW/test1/paltest_copyfilew_test1 +file_io/CopyFileW/test2/paltest_copyfilew_test2 +file_io/CopyFileW/test3/paltest_copyfilew_test3 +file_io/CreateFileA/test1/paltest_createfilea_test1 +file_io/CreateFileW/test1/paltest_createfilew_test1 +file_io/DeleteFileA/test1/paltest_deletefilea_test1 +file_io/DeleteFileW/test1/paltest_deletefilew_test1 +file_io/errorpathnotfound/test1/paltest_errorpathnotfound_test1 +file_io/errorpathnotfound/test2/paltest_errorpathnotfound_test2 +file_io/FILECanonicalizePath/paltest_filecanonicalizepath_test1 +file_io/FindClose/test1/paltest_findclose_test1 +file_io/FindFirstFileA/test1/paltest_findfirstfilea_test1 +file_io/FindFirstFileW/test1/paltest_findfirstfilew_test1 +file_io/FindNextFileA/test1/paltest_findnextfilea_test1 +file_io/FindNextFileA/test2/paltest_findnextfilea_test2 +file_io/FindNextFileW/test1/paltest_findnextfilew_test1 +file_io/FindNextFileW/test2/paltest_findnextfilew_test2 +file_io/FlushFileBuffers/test1/paltest_flushfilebuffers_test1 +file_io/GetConsoleOutputCP/test1/paltest_getconsoleoutputcp_test1 +file_io/GetCurrentDirectoryA/test1/paltest_getcurrentdirectorya_test1 +file_io/GetCurrentDirectoryW/test1/paltest_getcurrentdirectoryw_test1 +file_io/GetFileAttributesA/test1/paltest_getfileattributesa_test1 +file_io/GetFileAttributesExW/test1/paltest_getfileattributesexw_test1 +file_io/GetFileAttributesExW/test2/paltest_getfileattributesexw_test2 +file_io/GetFileAttributesW/test1/paltest_getfileattributesw_test1 +file_io/GetFileSize/test1/paltest_getfilesize_test1 +file_io/GetFileSizeEx/test1/paltest_getfilesizeex_test1 +file_io/GetFullPathNameA/test1/paltest_getfullpathnamea_test1 +file_io/GetFullPathNameA/test2/paltest_getfullpathnamea_test2 +file_io/GetFullPathNameA/test3/paltest_getfullpathnamea_test3 +file_io/GetFullPathNameA/test4/paltest_getfullpathnamea_test4 +file_io/GetFullPathNameW/test1/paltest_getfullpathnamew_test1 +file_io/GetFullPathNameW/test2/paltest_getfullpathnamew_test2 +file_io/GetFullPathNameW/test3/paltest_getfullpathnamew_test3 +file_io/GetFullPathNameW/test4/paltest_getfullpathnamew_test4 +file_io/GetStdHandle/test1/paltest_getstdhandle_test1 +file_io/GetStdHandle/test2/paltest_getstdhandle_test2 +file_io/GetSystemTime/test1/paltest_getsystemtime_test1 +file_io/GetSystemTimeAsFileTime/test1/paltest_getsystemtimeasfiletime_test1 +file_io/GetTempFileNameA/test1/paltest_gettempfilenamea_test1 +file_io/GetTempFileNameA/test2/paltest_gettempfilenamea_test2 +file_io/GetTempFileNameA/test3/paltest_gettempfilenamea_test3 +file_io/GetTempFileNameW/test1/paltest_gettempfilenamew_test1 +file_io/GetTempFileNameW/test2/paltest_gettempfilenamew_test2 +file_io/GetTempFileNameW/test3/paltest_gettempfilenamew_test3 +file_io/gettemppatha/test1/paltest_gettemppatha_test1 +file_io/GetTempPathW/test1/paltest_gettemppathw_test1 +file_io/MoveFileExA/test1/paltest_movefileexa_test1 +file_io/MoveFileExW/test1/paltest_movefileexw_test1 +file_io/ReadFile/test1/paltest_readfile_test1 +file_io/ReadFile/test2/paltest_readfile_test2 +file_io/ReadFile/test3/paltest_readfile_test3 +file_io/ReadFile/test4/paltest_readfile_test4 +file_io/SearchPathW/test1/paltest_searchpathw_test1 +file_io/SetEndOfFile/test1/paltest_setendoffile_test1 +file_io/SetEndOfFile/test2/paltest_setendoffile_test2 +file_io/SetEndOfFile/test3/paltest_setendoffile_test3 +file_io/SetEndOfFile/test4/paltest_setendoffile_test4 +file_io/SetEndOfFile/test5/paltest_setendoffile_test5 +file_io/SetFilePointer/test1/paltest_setfilepointer_test1 +file_io/SetFilePointer/test2/paltest_setfilepointer_test2 +file_io/SetFilePointer/test3/paltest_setfilepointer_test3 +file_io/SetFilePointer/test4/paltest_setfilepointer_test4 +file_io/SetFilePointer/test5/paltest_setfilepointer_test5 +file_io/SetFilePointer/test6/paltest_setfilepointer_test6 +file_io/SetFilePointer/test7/paltest_setfilepointer_test7 +file_io/WriteFile/test1/paltest_writefile_test1 +file_io/WriteFile/test2/paltest_writefile_test2 +file_io/WriteFile/test3/paltest_writefile_test3 +file_io/WriteFile/test4/paltest_writefile_test4 +file_io/WriteFile/test5/paltest_writefile_test5 +loader/LoadLibraryA/test1/paltest_loadlibrarya_test1 +loader/LoadLibraryA/test2/paltest_loadlibrarya_test2 +loader/LoadLibraryA/test3/paltest_loadlibrarya_test3 +loader/LoadLibraryA/test5/paltest_loadlibrarya_test5 +loader/LoadLibraryA/test7/paltest_loadlibrarya_test7 +loader/LoadLibraryW/test1/paltest_loadlibraryw_test1 +loader/LoadLibraryW/test2/paltest_loadlibraryw_test2 +loader/LoadLibraryW/test3/paltest_loadlibraryw_test3 +loader/LoadLibraryW/test5/paltest_loadlibraryw_test5 +locale_info/GetACP/test1/paltest_getacp_test1 +locale_info/MultiByteToWideChar/test1/paltest_multibytetowidechar_test1 +locale_info/MultiByteToWideChar/test2/paltest_multibytetowidechar_test2 +locale_info/MultiByteToWideChar/test3/paltest_multibytetowidechar_test3 +locale_info/MultiByteToWideChar/test4/paltest_multibytetowidechar_test4 +locale_info/WideCharToMultiByte/test1/paltest_widechartomultibyte_test1 +locale_info/WideCharToMultiByte/test2/paltest_widechartomultibyte_test2 +locale_info/WideCharToMultiByte/test3/paltest_widechartomultibyte_test3 +locale_info/WideCharToMultiByte/test4/paltest_widechartomultibyte_test4 +locale_info/WideCharToMultiByte/test5/paltest_widechartomultibyte_test5 +miscellaneous/CGroup/test1/paltest_cgroup_test1 +miscellaneous/CloseHandle/test1/paltest_closehandle_test1 +miscellaneous/CloseHandle/test2/paltest_closehandle_test2 +miscellaneous/CreatePipe/test1/paltest_createpipe_test1 +miscellaneous/FlushInstructionCache/test1/paltest_flushinstructioncache_test1 +miscellaneous/FormatMessageW/test1/paltest_formatmessagew_test1 +miscellaneous/FormatMessageW/test2/paltest_formatmessagew_test2 +miscellaneous/FormatMessageW/test3/paltest_formatmessagew_test3 +miscellaneous/FormatMessageW/test4/paltest_formatmessagew_test4 +miscellaneous/FormatMessageW/test5/paltest_formatmessagew_test5 +miscellaneous/FormatMessageW/test6/paltest_formatmessagew_test6 +miscellaneous/FreeEnvironmentStringsW/test1/paltest_freeenvironmentstringsw_test1 +miscellaneous/FreeEnvironmentStringsW/test2/paltest_freeenvironmentstringsw_test2 +miscellaneous/GetCommandLineW/test1/paltest_getcommandlinew_test1 +miscellaneous/GetEnvironmentStringsW/test1/paltest_getenvironmentstringsw_test1 +miscellaneous/GetEnvironmentVariableA/test1/paltest_getenvironmentvariablea_test1 +miscellaneous/GetEnvironmentVariableA/test2/paltest_getenvironmentvariablea_test2 +miscellaneous/GetEnvironmentVariableA/test3/paltest_getenvironmentvariablea_test3 +miscellaneous/GetEnvironmentVariableA/test4/paltest_getenvironmentvariablea_test4 +miscellaneous/GetEnvironmentVariableA/test5/paltest_getenvironmentvariablea_test5 +miscellaneous/GetEnvironmentVariableA/test6/paltest_getenvironmentvariablea_test6 +miscellaneous/GetEnvironmentVariableW/test1/paltest_getenvironmentvariablew_test1 +miscellaneous/GetEnvironmentVariableW/test2/paltest_getenvironmentvariablew_test2 +miscellaneous/GetEnvironmentVariableW/test3/paltest_getenvironmentvariablew_test3 +miscellaneous/GetEnvironmentVariableW/test4/paltest_getenvironmentvariablew_test4 +miscellaneous/GetEnvironmentVariableW/test5/paltest_getenvironmentvariablew_test5 +miscellaneous/GetEnvironmentVariableW/test6/paltest_getenvironmentvariablew_test6 +miscellaneous/GetLastError/test1/paltest_getlasterror_test1 +miscellaneous/GetSystemInfo/test1/paltest_getsysteminfo_test1 +miscellaneous/GetTickCount/test1/paltest_gettickcount_test1 +miscellaneous/GlobalMemoryStatusEx/test1/paltest_globalmemorystatusex_test1 +miscellaneous/InterlockedBit/test1/paltest_interlockedbit_test1 +miscellaneous/InterlockedBit/test2/paltest_interlockedbit_test2 +miscellaneous/InterlockedCompareExchange/test1/paltest_interlockedcompareexchange_test1 +miscellaneous/InterlockedCompareExchange/test2/paltest_interlockedcompareexchange_test2 +miscellaneous/InterlockedCompareExchange64/test1/paltest_interlockedcompareexchange64_test1 +miscellaneous/InterlockedCompareExchange64/test2/paltest_interlockedcompareexchange64_test2 +miscellaneous/InterlockedCompareExchangePointer/test1/paltest_interlockedcompareexchangepointer_test1 +miscellaneous/InterlockedDecrement/test1/paltest_interlockeddecrement_test1 +miscellaneous/InterlockedDecrement/test2/paltest_interlockeddecrement_test2 +miscellaneous/InterlockedDecrement64/test1/paltest_interlockeddecrement64_test1 +miscellaneous/InterlockedDecrement64/test2/paltest_interlockeddecrement64_test2 +miscellaneous/InterlockedExchange/test1/paltest_interlockedexchange_test1 +miscellaneous/InterlockedExchange64/test1/paltest_interlockedexchange64_test1 +miscellaneous/InterLockedExchangeAdd/test1/paltest_interlockedexchangeadd_test1 +miscellaneous/InterlockedExchangePointer/test1/paltest_interlockedexchangepointer_test1 +miscellaneous/InterlockedIncrement/test1/paltest_interlockedincrement_test1 +miscellaneous/InterlockedIncrement/test2/paltest_interlockedincrement_test2 +miscellaneous/InterlockedIncrement64/test1/paltest_interlockedincrement64_test1 +miscellaneous/InterlockedIncrement64/test2/paltest_interlockedincrement64_test2 +miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1 +miscellaneous/queryperformancefrequency/test1/paltest_queryperformancefrequency_test1 +miscellaneous/SetEnvironmentVariableA/test1/paltest_setenvironmentvariablea_test1 +miscellaneous/SetEnvironmentVariableA/test2/paltest_setenvironmentvariablea_test2 +miscellaneous/SetEnvironmentVariableA/test3/paltest_setenvironmentvariablea_test3 +miscellaneous/SetEnvironmentVariableA/test4/paltest_setenvironmentvariablea_test4 +miscellaneous/SetEnvironmentVariableW/test1/paltest_setenvironmentvariablew_test1 +miscellaneous/SetEnvironmentVariableW/test2/paltest_setenvironmentvariablew_test2 +miscellaneous/SetEnvironmentVariableW/test3/paltest_setenvironmentvariablew_test3 +miscellaneous/SetEnvironmentVariableW/test4/paltest_setenvironmentvariablew_test4 +miscellaneous/SetLastError/test1/paltest_setlasterror_test1 +miscellaneous/_i64tow/test1/paltest_i64tow_test1 +pal_specific/PAL_errno/test1/paltest_pal_errno_test1 +pal_specific/PAL_GetPALDirectoryW/test1/paltest_pal_getpaldirectoryw_test1 +pal_specific/PAL_GetUserTempDirectoryW/test1/paltest_pal_getusertempdirectoryw_test1 +pal_specific/PAL_Initialize_Terminate/test1/paltest_pal_initialize_terminate_test1 +pal_specific/PAL_Initialize_Terminate/test2/paltest_pal_initialize_terminate_test2 +pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/paltest_pal_registerlibraryw_unregisterlibraryw_test1 +pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/paltest_reg_unreg_libraryw_neg +samples/test1/paltest_samples_test1 +samples/test2/paltest_samples_test2 +threading/CreateEventW/test1/paltest_createeventw_test1 +threading/CreateEventW/test2/paltest_createeventw_test2 +threading/CreateEventW/test3/paltest_createeventw_test3 +threading/CreateMutexW_ReleaseMutex/test1/paltest_createmutexw_releasemutex_test1 +threading/CreateMutexW_ReleaseMutex/test2/paltest_createmutexw_releasemutex_test2 +threading/CreateProcessA/test1/paltest_createprocessa_test1 +threading/CreateProcessA/test2/paltest_createprocessa_test2 +threading/CreateProcessW/test1/paltest_createprocessw_test1 +threading/CreateProcessW/test2/paltest_createprocessw_test2 +threading/CreateSemaphoreW_ReleaseSemaphore/test1/paltest_createsemaphorew_releasesemaphore_test1 +threading/CreateSemaphoreW_ReleaseSemaphore/test2/paltest_createsemaphorew_releasesemaphore_test2 +threading/CreateSemaphoreW_ReleaseSemaphore/test3/paltest_createsemaphorew_releasesemaphore_test3 +threading/CreateThread/test1/paltest_createthread_test1 +threading/CreateThread/test2/paltest_createthread_test2 +threading/CreateThread/test3/paltest_createthread_test3 +threading/CriticalSectionFunctions/test1/paltest_criticalsectionfunctions_test1 +threading/CriticalSectionFunctions/test2/paltest_criticalsectionfunctions_test2 +threading/CriticalSectionFunctions/test3/paltest_criticalsectionfunctions_test3 +threading/CriticalSectionFunctions/test4/paltest_criticalsectionfunctions_test4 +threading/CriticalSectionFunctions/test5/paltest_criticalsectionfunctions_test5 +threading/CriticalSectionFunctions/test6/paltest_criticalsectionfunctions_test6 +threading/CriticalSectionFunctions/test7/paltest_criticalsectionfunctions_test7 +threading/CriticalSectionFunctions/test8/paltest_criticalsectionfunctions_test8 +threading/DuplicateHandle/test1/paltest_duplicatehandle_test1 +threading/DuplicateHandle/test10/paltest_duplicatehandle_test10 +threading/DuplicateHandle/test11/paltest_duplicatehandle_test11 +threading/DuplicateHandle/test12/paltest_duplicatehandle_test12 +threading/DuplicateHandle/test2/paltest_duplicatehandle_test2 +threading/DuplicateHandle/test3/paltest_duplicatehandle_test3 +threading/DuplicateHandle/test4/paltest_duplicatehandle_test4 +threading/DuplicateHandle/test5/paltest_duplicatehandle_test5 +threading/DuplicateHandle/test6/paltest_duplicatehandle_test6 +threading/DuplicateHandle/test7/paltest_duplicatehandle_test7 +threading/DuplicateHandle/test8/paltest_duplicatehandle_test8 +threading/DuplicateHandle/test9/paltest_duplicatehandle_test9 +threading/ExitProcess/test1/paltest_exitprocess_test1 +threading/ExitProcess/test2/paltest_exitprocess_test2 +threading/ExitProcess/test3/paltest_exitprocess_test3 +threading/ExitThread/test1/paltest_exitthread_test1 +threading/ExitThread/test2/paltest_exitthread_test2 +threading/GetCurrentProcess/test1/paltest_getcurrentprocess_test1 +threading/GetCurrentProcessId/test1/paltest_getcurrentprocessid_test1 +threading/GetCurrentThread/test1/paltest_getcurrentthread_test1 +threading/GetCurrentThread/test2/paltest_getcurrentthread_test2 +threading/GetCurrentThreadId/test1/paltest_getcurrentthreadid_test1 +threading/GetExitCodeProcess/test1/paltest_getexitcodeprocess_test1 +threading/GetProcessTimes/test2/paltest_getprocesstimes_test2 +threading/GetThreadTimes/test1/paltest_getthreadtimes_test1 +threading/NamedMutex/test1/paltest_namedmutex_test1 +threading/OpenEventW/test1/paltest_openeventw_test1 +threading/OpenEventW/test2/paltest_openeventw_test2 +threading/OpenEventW/test3/paltest_openeventw_test3 +threading/OpenEventW/test4/paltest_openeventw_test4 +threading/OpenEventW/test5/paltest_openeventw_test5 +threading/OpenProcess/test1/paltest_openprocess_test1 +threading/QueryThreadCycleTime/test1/paltest_querythreadcycletime_test1 +threading/QueueUserAPC/test1/paltest_queueuserapc_test1 +threading/QueueUserAPC/test2/paltest_queueuserapc_test2 +threading/QueueUserAPC/test3/paltest_queueuserapc_test3 +threading/QueueUserAPC/test4/paltest_queueuserapc_test4 +threading/QueueUserAPC/test5/paltest_queueuserapc_test5 +threading/QueueUserAPC/test6/paltest_queueuserapc_test6 +threading/QueueUserAPC/test7/paltest_queueuserapc_test7 +threading/ReleaseMutex/test3/paltest_releasemutex_test3 +threading/releasesemaphore/test1/paltest_releasesemaphore_test1 +threading/ResetEvent/test1/paltest_resetevent_test1 +threading/ResetEvent/test2/paltest_resetevent_test2 +threading/ResetEvent/test3/paltest_resetevent_test3 +threading/ResetEvent/test4/paltest_resetevent_test4 +threading/ResumeThread/test1/paltest_resumethread_test1 +threading/SetErrorMode/test1/paltest_seterrormode_test1 +threading/SetEvent/test1/paltest_setevent_test1 +threading/SetEvent/test2/paltest_setevent_test2 +threading/SetEvent/test3/paltest_setevent_test3 +threading/SetEvent/test4/paltest_setevent_test4 +threading/SignalObjectAndWait/paltest_signalobjectandwaittest +threading/Sleep/test1/paltest_sleep_test1 +threading/Sleep/test2/paltest_sleep_test2 +threading/SleepEx/test1/paltest_sleepex_test1 +threading/SleepEx/test2/paltest_sleepex_test2 +threading/SwitchToThread/test1/paltest_switchtothread_test1 +threading/TerminateProcess/test1/paltest_terminateprocess_test1 +threading/ThreadPriority/test1/paltest_threadpriority_test1 +threading/WaitForMultipleObjects/test1/paltest_waitformultipleobjects_test1 +threading/WaitForMultipleObjectsEx/test1/paltest_waitformultipleobjectsex_test1 +threading/WaitForMultipleObjectsEx/test2/paltest_waitformultipleobjectsex_test2 +threading/WaitForMultipleObjectsEx/test3/paltest_waitformultipleobjectsex_test3 +threading/WaitForMultipleObjectsEx/test4/paltest_waitformultipleobjectsex_test4 +threading/WaitForMultipleObjectsEx/test5/paltest_waitformultipleobjectsex_test5 +threading/WaitForMultipleObjectsEx/test6/paltest_waitformultipleobjectsex_test6 +threading/WaitForSingleObject/test1/paltest_waitforsingleobject_test1 +threading/WaitForSingleObject/WFSOExMutexTest/paltest_waitforsingleobject_wfsoexmutextest +threading/WaitForSingleObject/WFSOExSemaphoreTest/paltest_waitforsingleobject_wfsoexsemaphoretest +threading/WaitForSingleObject/WFSOExThreadTest/paltest_waitforsingleobject_wfsoexthreadtest +threading/WaitForSingleObject/WFSOMutexTest/paltest_waitforsingleobject_wfsomutextest +threading/WaitForSingleObject/WFSOProcessTest/paltest_waitforsingleobject_wfsoprocesstest +threading/WaitForSingleObject/WFSOSemaphoreTest/paltest_waitforsingleobject_wfsosemaphoretest +threading/WaitForSingleObject/WFSOThreadTest/paltest_waitforsingleobject_wfsothreadtest +threading/YieldProcessor/test1/paltest_yieldprocessor_test1 diff --git a/src/coreclr/src/pal/tests/palsuite/compileDisabledTests.txt b/src/coreclr/src/pal/tests/palsuite/compileDisabledTests.txt new file mode 100644 index 00000000000..1daa91173ee --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/compileDisabledTests.txt @@ -0,0 +1,57 @@ +composite/object_management/event/nonshared/paltest_event_nonshared +composite/object_management/event/shared/paltest_event_shared +composite/object_management/mutex/nonshared/paltest_mutex_nonshared +composite/object_management/mutex/shared/paltest_mutex_shared +composite/object_management/semaphore/nonshared/paltest_semaphore_nonshared +composite/object_management/semaphore/shared/paltest_semaphore_shared +composite/synchronization/criticalsection/paltest_synchronization_criticalsection +composite/synchronization/nativecriticalsection/paltest_synchronization_nativecriticalsection +composite/synchronization/nativecs_interlocked/paltest_synchronization_nativecs_interlocked +composite/threading/threadsuspension/paltest_threading_threadsuspension +composite/threading/threadsuspension_switchthread/paltest_threading_threadsuspension_switchthread +composite/wfmo/paltest_composite_wfmo +c_runtime/iswprint/test1/paltest_iswprint_test1 +c_runtime/vprintf/test1/paltest_vprintf_test1 +c_runtime/_gcvt/test1/paltest_gcvt_test1 +c_runtime/_gcvt/test2/paltest_gcvt_test2 +debug_api/DebugBreak/test1/paltest_debugbreak_test1 +debug_api/WriteProcessMemory/test1/paltest_writeprocessmemory_test1 +debug_api/WriteProcessMemory/test3/paltest_writeprocessmemory_test3 +debug_api/WriteProcessMemory/test4/paltest_writeprocessmemory_test4 +exception_handling/pal_except/test1/paltest_pal_except_test1 +exception_handling/pal_except/test2/paltest_pal_except_test2 +exception_handling/pal_except/test3/paltest_pal_except_test3 +exception_handling/pal_except/test4/paltest_pal_except_test4 +exception_handling/pal_except/test5/paltest_pal_except_test5 +exception_handling/pal_except/test6/paltest_pal_except_test6 +exception_handling/pal_except/test7/paltest_pal_except_test7 +exception_handling/PAL_EXCEPT_FILTER/test1/paltest_pal_except_filter_test1 +exception_handling/PAL_EXCEPT_FILTER/test2/paltest_pal_except_filter_test2 +exception_handling/PAL_EXCEPT_FILTER/test3/paltest_pal_except_filter_test3 +exception_handling/PAL_EXCEPT_FILTER_EX/test1/paltest_pal_except_filter_ex_test1 +exception_handling/PAL_EXCEPT_FILTER_EX/test2/paltest_pal_except_filter_ex_test2 +exception_handling/PAL_EXCEPT_FILTER_EX/test3/paltest_pal_except_filter_ex_test3 +exception_handling/pal_finally/test1/paltest_pal_finally_test1 +exception_handling/PAL_TRY_EXCEPT/test1/paltest_pal_try_except_test1 +exception_handling/PAL_TRY_EXCEPT/test2/paltest_pal_try_except_test2 +exception_handling/PAL_TRY_EXCEPT_EX/test1/paltest_pal_try_except_ex_test1 +exception_handling/PAL_TRY_EXCEPT_EX/test2/paltest_pal_try_except_ex_test2 +exception_handling/PAL_TRY_EXCEPT_EX/test3/paltest_pal_try_except_ex_test3 +exception_handling/PAL_TRY_LEAVE_FINALLY/test1/paltest_pal_try_leave_finally_test1 +filemapping_memmgt/CreateFileMappingW/test2/paltest_createfilemappingw_test2 +loader/LoadLibraryA/test6/paltest_loadlibrarya_test6 +loader/LoadLibraryA/test8/paltest_loadlibrarya_test8 +locale_info/CompareStringA/test1/paltest_comparestringa_test1 +locale_info/CompareStringW/test1/paltest_comparestringw_test1 +locale_info/GetLocaleInfoW/test1/paltest_getlocaleinfow_test1 +locale_info/GetLocaleInfoW/test2/paltest_getlocaleinfow_test2 +miscellaneous/IsBadCodePtr/test1/paltest_isbadcodeptr_test1 +miscellaneous/IsBadReadPtr/test1/paltest_isbadreadptr_test1 +miscellaneous/IsBadWritePtr/test1/paltest_isbadwriteptr_test1 +miscellaneous/IsBadWritePtr/test2/paltest_isbadwriteptr_test2 +miscellaneous/IsBadWritePtr/test3/paltest_isbadwriteptr_test3 +miscellaneous/MessageBoxW/test1/paltest_messageboxw_test1 +miscellaneous/MessageBoxW/test2/paltest_messageboxw_test2 +pal_specific/PAL_get_stderr/test1/paltest_pal_get_stderr_test1 +pal_specific/PAL_get_stdin/test1/paltest_pal_get_stdin_test1 +pal_specific/PAL_get_stdout/test1/paltest_pal_get_stdout_test1 diff --git a/src/coreclr/src/pal/tests/palsuite/composite/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/CMakeLists.txt deleted file mode 100644 index 17d0105eea5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(object_management) -add_subdirectory(synchronization) -add_subdirectory(threading) -add_subdirectory(wfmo) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/CMakeLists.txt deleted file mode 100644 index 1786ba32c69..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(event) -add_subdirectory(mutex) -add_subdirectory(semaphore) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/CMakeLists.txt deleted file mode 100644 index 4eeff15aa73..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(nonshared) -add_subdirectory(shared) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt deleted file mode 100644 index 666e5e8a17c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - event.cpp - main.cpp -) - -add_executable(paltest_event_nonshared - ${SOURCES} -) - -add_dependencies(paltest_event_nonshared coreclrpal) - -target_link_libraries(paltest_event_nonshared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp index 337e0cf74f1..72c9fa811c6 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp @@ -59,7 +59,7 @@ int testStatus; const char sTmpEventName[MAX_PATH_FNAME] = "StartTestEvent"; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_event_nonshared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -110,7 +110,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_event_nonshared_paltest_event_nonshared, "composite/object_management/event/nonshared/paltest_event_nonshared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -205,7 +205,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_event_nonshared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -283,12 +283,12 @@ int GetParameters( int argc, char **argv) testStatus = FAIL; } - PAL_Terminate(); + PAL_TerminateEx(testStatus); return testStatus; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_event_nonshared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp index 2d326c4b724..115632a833f 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp @@ -83,7 +83,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_event_nonshared_paltest_event_nonshared, "composite/object_management/event/nonshared/paltest_event_nonshared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt deleted file mode 100644 index 008739c3b86..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - event.cpp - main.cpp -) - -add_executable(paltest_event_shared - ${SOURCES} -) - -add_dependencies(paltest_event_shared coreclrpal) - -target_link_libraries(paltest_event_shared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp index 8f136f3b537..b09322d4b97 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp @@ -57,7 +57,7 @@ int testStatus; const char sTmpEventName[MAX_PATH] = "StartTestEvent"; char objectSuffix[MAX_PATH]; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_event_shared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -113,7 +113,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_event_shared_paltest_event_shared, "composite/object_management/event/shared/paltest_event_shared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -218,7 +218,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_event_shared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -301,7 +301,7 @@ int GetParameters( int argc, char **argv) return testStatus; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_event_shared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp index 6824d3c2507..cce500d10cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp @@ -91,7 +91,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_event_shared_paltest_event_shared, "composite/object_management/event/shared/paltest_event_shared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/CMakeLists.txt deleted file mode 100644 index 4eeff15aa73..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(nonshared) -add_subdirectory(shared) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt deleted file mode 100644 index 87932ffb640..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - main.cpp - mutex.cpp -) - -add_executable(paltest_mutex_nonshared - ${SOURCES} -) - -add_dependencies(paltest_mutex_nonshared coreclrpal) - -target_link_libraries(paltest_mutex_nonshared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp index 0937a2a8967..4277e66e082 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp @@ -83,7 +83,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_mutex_nonshared_paltest_mutex_nonshared, "composite/object_management/mutex/nonshared/paltest_mutex_nonshared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp index 8dc808c99ab..c1dab2341c0 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp @@ -51,7 +51,7 @@ ResultBuffer *resultBuffer = NULL; int testStatus; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_mutex_nonshared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -100,7 +100,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_mutex_nonshared_paltest_mutex_nonshared, "composite/object_management/mutex/nonshared/paltest_mutex_nonshared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -195,7 +195,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_mutex_nonshared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -270,7 +270,7 @@ int GetParameters( int argc, char **argv) return testStatus; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_mutex_nonshared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt deleted file mode 100644 index d058c448332..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - main.cpp - mutex.cpp -) - -add_executable(paltest_mutex_shared - ${SOURCES} -) - -add_dependencies(paltest_mutex_shared coreclrpal) - -target_link_libraries(paltest_mutex_shared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp index a8481f60d1b..3790785d065 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp @@ -93,7 +93,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_mutex_shared_paltest_mutex_shared, "composite/object_management/mutex/shared/paltest_mutex_shared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp index 19fe3ad6f90..1429c78fa07 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp @@ -59,7 +59,7 @@ int testStatus; const char sTmpEventName[MAX_PATH] = "StartTestEvent"; char objectSuffix[MAX_PATH]; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_mutex_shared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -115,7 +115,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_mutex_shared_paltest_mutex_shared, "composite/object_management/mutex/shared/paltest_mutex_shared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -212,7 +212,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_mutex_shared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -286,7 +286,7 @@ int GetParameters( int argc, char **argv) return testStatus; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_mutex_shared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/CMakeLists.txt deleted file mode 100644 index 4eeff15aa73..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(nonshared) -add_subdirectory(shared) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt deleted file mode 100644 index 4b35e86f613..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - main.cpp - semaphore.cpp -) - -add_executable(paltest_semaphore_nonshared - ${SOURCES} -) - -add_dependencies(paltest_semaphore_nonshared coreclrpal) - -target_link_libraries(paltest_semaphore_nonshared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp index effe5c3527f..99b0b2b2a55 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp @@ -83,7 +83,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_semaphore_nonshared_paltest_semaphore_nonshared, "composite/object_management/semaphore/nonshared/paltest_semaphore_nonshared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp index 098119ccc28..cfa21e95659 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp @@ -59,7 +59,7 @@ int testStatus; const char sTmpEventName[MAX_PATH] = "StartTestEvent"; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_semaphore_nonshared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -108,7 +108,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_semaphore_nonshared_paltest_semaphore_nonshared, "composite/object_management/semaphore/nonshared/paltest_semaphore_nonshared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -204,7 +204,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_semaphore_nonshared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -275,7 +275,7 @@ int GetParameters( int argc, char **argv) return PASS; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_semaphore_nonshared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt deleted file mode 100644 index 92fb32ab3d8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - main.cpp - semaphore.cpp -) - -add_executable(paltest_semaphore_shared - ${SOURCES} -) - -add_dependencies(paltest_semaphore_shared coreclrpal) - -target_link_libraries(paltest_semaphore_shared - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp index d24acdcc700..df1ea1f7bea 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp @@ -94,7 +94,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_semaphore_shared_paltest_semaphore_shared, "composite/object_management/semaphore/shared/paltest_semaphore_shared") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp index 55b87e29977..7365dff49db 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp @@ -59,7 +59,7 @@ int testStatus; const char sTmpEventName[MAX_PATH] = "StartTestEvent"; char objectSuffix[MAX_PATH]; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_semaphore_shared(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -112,7 +112,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_object_management_semaphore_shared_paltest_semaphore_shared, "composite/object_management/semaphore/shared/paltest_semaphore_shared") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -216,7 +216,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_semaphore_shared,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -284,7 +284,7 @@ int GetParameters( int argc, char **argv) return PASS; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_semaphore_shared (LPVOID lpParam) { unsigned int i = 0; DWORD dwWaitResult; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/CMakeLists.txt deleted file mode 100644 index e21f4d367d3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(criticalsection) -add_subdirectory(nativecriticalsection) -add_subdirectory(nativecs_interlocked) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt deleted file mode 100644 index 8b7b607baaf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - criticalsection.cpp - mainWrapper.cpp -) - -add_executable(paltest_synchronization_criticalsection - ${SOURCES} -) - -add_dependencies(paltest_synchronization_criticalsection coreclrpal) - -target_link_libraries(paltest_synchronization_criticalsection - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp index 60a41283ee2..641c0fdcf35 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp @@ -210,7 +210,7 @@ enterandleavecs( LPVOID lpParam ) } -int __cdecl main (int argc, char **argv) +PALTEST(composite_synchronization_criticalsection_paltest_synchronization_criticalsection, "composite/synchronization/criticalsection/paltest_synchronization_criticalsection") { /* diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp index 7f9659dd997..da99d5ef358 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp @@ -87,7 +87,7 @@ int GetParameters( int argc, char **argv) } //Main entry point for the application - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_synchronization_criticalsection_paltest_synchronization_criticalsection, "composite/synchronization/criticalsection/paltest_synchronization_criticalsection") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; //Array to hold Process handles diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt deleted file mode 100644 index 6ba58525686..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - mtx_critsect.cpp - pal_composite_native_cs.cpp - resultbuffer.cpp -) - -add_executable(paltest_synchronization_nativecriticalsection - ${SOURCES} -) - -add_dependencies(paltest_synchronization_nativecriticalsection coreclrpal) - -target_link_libraries(paltest_synchronization_nativecriticalsection - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp index a36931205a5..ba077cba615 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp @@ -66,7 +66,7 @@ ULONGLONG getPerfCallibrationValue(void); -extern int main(int argc, char **argv) +PALTEST(composite_synchronization_nativecriticalsection_paltest_synchronization_nativecriticalsection, "composite/synchronization/nativecriticalsection/paltest_synchronization_nativecriticalsection") { //Variable Declaration pthread_t pthreads[640]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt deleted file mode 100644 index 90f52dd46d3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(SOURCES - interlocked.cpp - mtx_critsect.cpp - pal_composite_native_cs.cpp - resultbuffer.cpp -) - -add_executable(paltest_synchronization_nativecs_interlocked - ${SOURCES} -) - -add_dependencies(paltest_synchronization_nativecs_interlocked coreclrpal) - -target_link_libraries(paltest_synchronization_nativecs_interlocked - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp index 18d96742377..3f1d31e5d1b 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp @@ -66,7 +66,7 @@ ULONGLONG getPerfCallibrationValue(void); -extern int main(int argc, char **argv) +PALTEST(composite_synchronization_nativecs_interlocked_paltest_synchronization_nativecs_interlocked, "composite/synchronization/nativecs_interlocked/paltest_synchronization_nativecs_interlocked") { //Variable Declaration pthread_t pthreads[640]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/threading/CMakeLists.txt deleted file mode 100644 index 2b4f0ea8a63..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(threadsuspension) -add_subdirectory(threadsuspension_switchthread) - diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt deleted file mode 100644 index a931f974273..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - mainWrapper.cpp - threadsuspension.cpp -) - -add_executable(paltest_threading_threadsuspension - ${SOURCES} -) - -add_dependencies(paltest_threading_threadsuspension coreclrpal) - -target_link_libraries(paltest_threading_threadsuspension - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp index 4366f26137e..72a1b3d9ce4 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp @@ -87,7 +87,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_threading_threadsuspension_paltest_threading_threadsuspension, "composite/threading/threadsuspension/paltest_threading_threadsuspension") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/samplefile.dat b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/samplefile.dat deleted file mode 100644 index d6505f2549b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/samplefile.dat +++ /dev/null @@ -1,5124 +0,0 @@ -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense blackasdf dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp index 2e2539445e3..ede0e4b7580 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp @@ -138,7 +138,7 @@ int GetParameters(int, char * *); //Main Entry for the Thread Suspension Test Case -int __cdecl main (int argc, char **argv) +PALTEST(composite_threading_threadsuspension_paltest_threading_threadsuspension, "composite/threading/threadsuspension/paltest_threading_threadsuspension") { /* diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt deleted file mode 100644 index 0d6a8fbdbfb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - mainWrapper.cpp - threadsuspension.cpp -) - -add_executable(paltest_threading_threadsuspension_switchthread - ${SOURCES} -) - -add_dependencies(paltest_threading_threadsuspension_switchthread coreclrpal) - -target_link_libraries(paltest_threading_threadsuspension_switchthread - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp index 4366f26137e..1f95d7dced4 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp @@ -87,7 +87,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_threading_threadsuspension_switchthread_paltest_threading_threadsuspension_switchthread, "composite/threading/threadsuspension_switchthread/paltest_threading_threadsuspension_switchthread") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/samplefile.dat b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/samplefile.dat deleted file mode 100644 index d6505f2549b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/samplefile.dat +++ /dev/null @@ -1,5124 +0,0 @@ -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense blackasdf dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. -By Patricia Reaney -LONDON (Reuters) - Europe, Africa and the Middle East are the best vantage points to see the first transit of Venus across the sun in more than a century on Tuesday, scientists said. - -Mostly clear skies are forecast in many parts of the three regions, but people were urged to be careful if they watch the rare event when it begins at 1:19 a.m. EDT because it could cause blindness. Views will be restricted from Asia and the Americas. - -Unlike a solar eclipse by the moon that is over in two or three minutes, Venus's transit -- which last occurred in 1882 -- will go on for six hours. - -The planet will appear as an intense black dot on the solar disc. - -Most of the sun will be visible as Venus crosses to the right from the bottom left side of the solar disc. Venus will be 26.7 million miles from earth. - -"Venus will be about 1/30 the size of the diameter of the sun, but it will be much darker and more intense than sunspots," said Dr Robert Walsh, of the University of Central Lancashire's Center for Astrophysics in northern England. - -Scientists recommend some form of indirect projection as the safest way to observe the phenomenon. - -"Never ever look directly at the sun with the naked eye or any sort of optical equipment -- telescope, binoculars or even digital camera," said Walsh. - -"Even if you glance at the sun for a short period of time you can damage your eye and lose some of your sight," he said. - -Internet sites will be covering the transit and observatories around the world have organized viewings. - -"Mainly Western Europe could see some high cloud that might prevent people from seeing it," said a spokesman for Britain's Meteorological Office. "The rest of Europe shouldn't be too bad. It should be fine." - -German astronomer Johannes Kepler first predicted a transit of Venus in 1627 but he died before he could witness one. English astronomer Jeremiah Horrocks first observed it in 1639. - -The transit occurs four times in every 243 years. There are two December transits, eight years apart, and then 121.5 years later there are two June transits, also eight years apart. After another 105.5 years the cycle begins again. - -The next transit will occur in 2012 when it will be visible from parts of Asia and the Pacific but not Europe. diff --git a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp index da445a06570..8ccf29d01f8 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp @@ -138,7 +138,7 @@ int GetParameters(int, char * *); //Main Entry for the Thread Suspension Test Case -int __cdecl main (int argc, char **argv) +PALTEST(composite_threading_threadsuspension_switchthread_paltest_threading_threadsuspension_switchthread, "composite/threading/threadsuspension_switchthread/paltest_threading_threadsuspension_switchthread") { /* diff --git a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt deleted file mode 100644 index 11cc57108a9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SOURCES - main.cpp - mutex.cpp -) - -add_executable(paltest_composite_wfmo - ${SOURCES} -) - -add_dependencies(paltest_composite_wfmo coreclrpal) - -target_link_libraries(paltest_composite_wfmo - ${COMMON_TEST_LIBRARIES} - rt -) diff --git a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/main.cpp b/src/coreclr/src/pal/tests/palsuite/composite/wfmo/main.cpp index 43c5b98c7b3..599109fb142 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/main.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/wfmo/main.cpp @@ -97,7 +97,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite_wfmo") { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; diff --git a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/mutex.cpp b/src/coreclr/src/pal/tests/palsuite/composite/wfmo/mutex.cpp index 5d2310fcfb1..a95f93cc1fa 100644 --- a/src/coreclr/src/pal/tests/palsuite/composite/wfmo/mutex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/composite/wfmo/mutex.cpp @@ -56,7 +56,7 @@ ResultBuffer *resultBuffer = NULL; int testStatus; -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_composite_wfmo(LPVOID lpParam); int GetParameters( int argc, char **argv) { @@ -115,7 +115,7 @@ int GetParameters( int argc, char **argv) return 0; } - int __cdecl main(INT argc, CHAR **argv) +PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite_wfmo") { unsigned int i = 0; HANDLE hThread[MAXIMUM_WAIT_OBJECTS]; @@ -205,7 +205,7 @@ int GetParameters( int argc, char **argv) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_composite_wfmo,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -287,7 +287,7 @@ int GetParameters( int argc, char **argv) return testStatus; } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_composite_wfmo (LPVOID lpParam) { unsigned int i = 0; struct statistics stats; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/CMakeLists.txt deleted file mode 100644 index 62493c1ee4f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# TODO: make these tests compile -# add_subdirectory(DebugBreak) -# add_subdirectory(WriteProcessMemory) - -add_subdirectory(OutputDebugStringA) -add_subdirectory(OutputDebugStringW) - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt deleted file mode 100644 index 0614c48de9e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_debugbreak_test1 - ${SOURCES} -) - -add_dependencies(paltest_debugbreak_test1 coreclrpal) - -target_link_libraries(paltest_debugbreak_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp index b0872c3f37d..6c0bf1d5a14 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_DebugBreak_test1_paltest_debugbreak_test1, "debug_api/DebugBreak/test1/paltest_debugbreak_test1") { BOOL bTry = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/testinfo.dat deleted file mode 100644 index 65215093cd0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/DebugBreak/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = DebugBreak -Name = DebugBreak test #1 -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests that DebugBreak "works". This will require case by case -= manual interpretation. diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt deleted file mode 100644 index 20b49a02a74..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -set(TESTSOURCES - test1.cpp -) - -add_executable(paltest_outputdebugstringa_test1 - ${TESTSOURCES} -) - -add_dependencies(paltest_outputdebugstringa_test1 coreclrpal) - -target_link_libraries(paltest_outputdebugstringa_test1 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - helper.cpp -) - -add_executable(paltest_outputdebugstringa_test1_helper - ${HELPERSOURCES} -) - -add_dependencies(paltest_outputdebugstringa_test1_helper coreclrpal) - -target_link_libraries(paltest_outputdebugstringa_test1_helper - ${COMMON_TEST_LIBRARIES} -) - - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp index 85f9c64b8ba..e47029fa786 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_OutputDebugStringA_test1_paltest_outputdebugstringa_test1_helper, "debug_api/OutputDebugStringA/test1/paltest_outputdebugstringa_test1_helper") { if(0 != (PAL_Initialize(argc, argv))) { diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp index a99651a1b8a..98f0a1b95b0 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp @@ -23,7 +23,7 @@ struct OutputCheck char *ExpectedStr; }; -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_OutputDebugStringA_test1_paltest_outputdebugstringa_test1, "debug_api/OutputDebugStringA/test1/paltest_outputdebugstringa_test1") { PROCESS_INFORMATION pi; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/testinfo.dat deleted file mode 100644 index e4d37931ec9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = OutputDebugStringA -Name = OutputDebugStringA test #1 -TYPE = DEFAULT -EXE1 = test1 -EXE2 = helper -Description -=Tests that OutputDebugString generates the correct debugging event behaviour. diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt deleted file mode 100644 index c23befae1cf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_outputdebugstringw_test1 - ${SOURCES} -) - -add_dependencies(paltest_outputdebugstringw_test1 coreclrpal) - -target_link_libraries(paltest_outputdebugstringw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp index c0fb3743ede..3e12cd53a00 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp @@ -15,7 +15,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_OutputDebugStringW_test1_paltest_outputdebugstringw_test1, "debug_api/OutputDebugStringW/test1/paltest_outputdebugstringw_test1") { WCHAR *str1; WCHAR *str2; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/testinfo.dat deleted file mode 100644 index eee22efa924..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = OutputDebugStringW -Name = OutputDebugStringW test #1 -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that OutputDebugString generates the correct debugging event behaviour. diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/CMakeLists.txt deleted file mode 100644 index dd5da444112..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt deleted file mode 100644 index e2d976676f4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test1.cpp -) - -add_executable(paltest_writeprocessmemory_test1 - ${TESTSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test1 coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test1 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - helper.cpp -) - -add_executable(paltest_writeprocessmemory_test1_helper - ${HELPERSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test1_helper coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test1_helper - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp index ba53f6e17be..edf8857b864 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp @@ -124,7 +124,7 @@ int wpmDoIt(struct allhandles_t Comms, return TRUE; } -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test1_paltest_writeprocessmemory_test1_helper, "debug_api/WriteProcessMemory/test1/paltest_writeprocessmemory_test1_helper") { BOOL success = TRUE; /* assume success */ @@ -236,7 +236,7 @@ EXIT: Fail(""); } - PAL_Terminate(); + PAL_TerminateEx(success ? PASS : FAIL); return success ? PASS : FAIL; } diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp index a3608bde245..41f4f825ca2 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test1_paltest_writeprocessmemory_test1, "debug_api/WriteProcessMemory/test1/paltest_writeprocessmemory_test1") { PROCESS_INFORMATION pi; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/testinfo.dat deleted file mode 100644 index 130bba97be9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = WriteProcessMemory -Name = Check that writing text to process memory succeeds. -TYPE = DEFAULT -EXE1 = test1 -EXE2 = helper -Description -= Create a child process and attempt to write to its memory -= at the places and lengths it specifies via a data file. -= the child verifies that all the specified memory was altered -= with no overruns. diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt deleted file mode 100644 index 4c8364dd093..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test3.cpp -) - -add_executable(paltest_writeprocessmemory_test3 - ${TESTSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test3 coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test3 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - helper.cpp -) - -add_executable(paltest_writeprocessmemory_test3_helper - ${HELPERSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test3_helper coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test3_helper - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp index a6447742426..3479bc39f53 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp @@ -121,7 +121,7 @@ int wpmVerifyCant(struct allhandles_t Comms, return TRUE; } -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test3_paltest_writeprocessmemory_test3_helper, "debug_api/WriteProcessMemory/test3/paltest_writeprocessmemory_test3_helper") { BOOL success = TRUE; /* assume success */ struct allhandles_t Comms = {0,0,0} ; @@ -249,7 +249,7 @@ EXIT: Fail(""); } - PAL_Terminate(); + PAL_TerminateEx(success ? PASS : FAIL); return success ? PASS : FAIL; } diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp index bef06d0843e..196efb1b2ab 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test3_paltest_writeprocessmemory_test3, "debug_api/WriteProcessMemory/test3/paltest_writeprocessmemory_test3") { PROCESS_INFORMATION pi; @@ -199,6 +199,6 @@ int __cdecl main(int argc, char *argv[]) PEDANTIC(CloseHandle, (pi.hThread)); PEDANTIC(CloseHandle, (pi.hProcess)); - PAL_Terminate(dwExitCode); + PAL_TerminateEx(dwExitCode); return dwExitCode; } diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/testinfo.dat deleted file mode 100644 index 92dd2c62320..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = WriteProcessMemory -Name = Check that you can't write from writable to protected memory. -TYPE = DEFAULT -EXE1 = test3 -EXE2 = helper -Description -= Create a child process and debug it. When the child -= raises an exception, it sends back a memory location. Call -= WriteProcessMemory on the memory location, but attempt to write -= more than the memory allows. This should cause an error and the -= data should be unchanged. diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt deleted file mode 100644 index 21b2fda3b95..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test4.cpp -) - -add_executable(paltest_writeprocessmemory_test4 - ${TESTSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test4 coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test4 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - helper.cpp -) - -add_executable(paltest_writeprocessmemory_test4_helper - ${HELPERSOURCES} -) - -add_dependencies(paltest_writeprocessmemory_test4_helper coreclrpal) - -target_link_libraries(paltest_writeprocessmemory_test4_helper - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp index aa9746f5632..42ee9125bc7 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> const int MY_EXCEPTION=999; -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test4_paltest_writeprocessmemory_test4_helper, "debug_api/WriteProcessMemory/test4/paltest_writeprocessmemory_test4_helper") { char* Memory; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp index 34f72ce1c02..577869b7871 100644 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> const int MY_EXCEPTION=999; -int __cdecl main(int argc, char *argv[]) +PALTEST(debug_api_WriteProcessMemory_test4_paltest_writeprocessmemory_test4, "debug_api/WriteProcessMemory/test4/paltest_writeprocessmemory_test4") { PROCESS_INFORMATION pi; diff --git a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/testinfo.dat deleted file mode 100644 index 4f69644dce2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Debug -Function = WriteProcessMemory -Name = Check that you can't write to protected memory. -TYPE = DEFAULT -EXE1 = test4 -EXE2 = helper -Description -= Create a child process and debug it. When the child -= raises an exception, it sends back a memory location. Call -= WriteProcessMemory on a restricted memory location and ensure that -= it fails. - diff --git a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt index 845fae656be..87a2b12f08c 100644 --- a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt @@ -1,4 +1,5 @@ set(SOURCES + EnableEventLogging.cpp ${CMAKE_CURRENT_BINARY_DIR}/clralltestevents.cpp ) @@ -19,7 +20,7 @@ if(TARGET_UNIX) include_directories(${COREPAL_SOURCE_DIR}/inc/rt) endif(TARGET_UNIX) -add_executable(eventprovidertest +_add_executable(eventprovidertest ${SOURCES} ) set(EVENT_PROVIDER_DEPENDENCIES "") @@ -37,3 +38,5 @@ endif(FEATURE_EVENT_TRACE) target_link_libraries(eventprovidertest ${EVENT_PROVIDER_DEPENDENCIES} coreclrpal) add_dependencies(eventprovidertest eventing_headers) + +_install (TARGETS eventprovidertest DESTINATION paltests/eventprovider)
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/eventprovider/EnableEventLogging.cpp b/src/coreclr/src/pal/tests/palsuite/eventprovider/EnableEventLogging.cpp new file mode 100644 index 00000000000..fb6cf9d8977 --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/eventprovider/EnableEventLogging.cpp @@ -0,0 +1,22 @@ + +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +/*===================================================================== +** +** Source: EnableEnventLogging.cpp +** +** Purpose: Fix linker issue on platforms where the PAL is built against +** verion 2.4 of liblttng-ust-dev +** +** +**===================================================================*/ + +#if defined(HOST_UNIX) +// This is a wrapper method for LTTng. See https://github.com/dotnet/coreclr/pull/27273 for details. +extern "C" bool XplatEventLoggerIsEnabled() +{ + // As we are testing the lttng events here, enable them unconditionally. + return true; +} +#endif // HOST_UNIX diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt deleted file mode 100644 index c650506afd3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_subdirectory(pal_sxs) -#add_subdirectory(pal_except) -#add_subdirectory(PAL_EXCEPT_FILTER) -#add_subdirectory(PAL_EXCEPT_FILTER_EX) -#add_subdirectory(pal_finally) -#add_subdirectory(PAL_TRY_EXCEPT) -#add_subdirectory(PAL_TRY_EXCEPT_EX) -#add_subdirectory(PAL_TRY_LEAVE_FINALLY) -add_subdirectory(RaiseException) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt deleted file mode 100644 index e186c6e987e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_EXCEPT_FILTER.cpp -) - -add_executable(paltest_pal_except_filter_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_test1 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp index fa537b43d0b..3c44088bfb7 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp @@ -46,7 +46,7 @@ LONG ExitFilter(EXCEPTION_POINTERS* ep, LPVOID pnTestInt) } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_test1_paltest_pal_except_filter_test1, "exception_handling/PAL_EXCEPT_FILTER/test1/paltest_pal_except_filter_test1") { int* p = 0x00000000; /* pointer to NULL */ BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/testinfo.dat deleted file mode 100644 index 1d68e987f53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER -Name = Test for PAL_EXCEPT_FILTER -Type = DEFAULT -EXE1 = pal_except_filter -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER. An -= exception is forced and a known value is passed to the filter -= fuction. The known value as well as booleans are tested to -= ensure proper functioning. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt deleted file mode 100644 index baaac69333a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_except_filter.cpp -) - -add_executable(paltest_pal_except_filter_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_test2 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp index 0e960c24787..c5abcc6b39c 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp @@ -70,7 +70,7 @@ LONG ExitFilter(EXCEPTION_POINTERS* ep, LPVOID pnTestInt) } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_test2_paltest_pal_except_filter_test2, "exception_handling/PAL_EXCEPT_FILTER/test2/paltest_pal_except_filter_test2") { BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/testinfo.dat deleted file mode 100644 index 66789ab817d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER -Name = Test for PAL_EXCEPT_FILTER -Type = DEFAULT -EXE1 = pal_except_filter -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER. An -= exception is forced and the filter returns -= EXCEPTION_CONTINUE_EXECUTION to allow execution to continue. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt deleted file mode 100644 index 54dd18aca98..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_except_filter.cpp -) - -add_executable(paltest_pal_except_filter_test3 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_test3 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp index 11f420ea809..afa2fb3320f 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp @@ -104,7 +104,7 @@ void NestedFunc2 (void) NestedFunc1(); } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_test3_paltest_pal_except_filter_test3, "exception_handling/PAL_EXCEPT_FILTER/test3/paltest_pal_except_filter_test3") { if (0 != PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/testinfo.dat deleted file mode 100644 index 795ba064b8c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER_EX -Name = Test for nested PAL_EXCEPT_FILTER functions & EXCEPTION_CONTINUE_SEARCH -Type = DEFAULT -EXE1 = pal_except_filter -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER with nested -= functions to build a call stack. An -= exception is forced and passed to two nested exception filters for -= consideration. The first filter returns EXCEPTION_CONTINUE_SEARCH -= so the second can run and return EXCEPTION_EXECUTE_HANDLER. The -= initial exception handler should be skipped, and the second -= executed diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt deleted file mode 100644 index c6bc2efd755..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_EXCEPT_FILTER_EX.cpp -) - -add_executable(paltest_pal_except_filter_ex_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_ex_test1 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_ex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp index b987b14f59d..1a2668716e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp @@ -70,7 +70,7 @@ LONG Filter_02(EXCEPTION_POINTERS* ep, VOID *pnTestInt) } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_EX_test1_paltest_pal_except_filter_ex_test1, "exception_handling/PAL_EXCEPT_FILTER_EX/test1/paltest_pal_except_filter_ex_test1") { int* p = 0x00000000; BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/testinfo.dat deleted file mode 100644 index 3dae7bcad5d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER_EX -Name = Test for PAL_EXCEPT_FILTER_EX -Type = DEFAULT -EXE1 = pal_except_filter_ex -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER_EX. -= There are two try blocks in this test. The first forces an -= exception error to force hitting the first filter. The second -= doesn't to make sure we don't hit the filter. A value is also -= passed into the filter program and it is validated to make sure -= it was passed correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt deleted file mode 100644 index ceb214a7dd2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_except_filter_ex.cpp -) - -add_executable(paltest_pal_except_filter_ex_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_ex_test2 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_ex_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp index 314221178b4..1b3a05654a8 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp @@ -54,7 +54,7 @@ LONG Filter_01(EXCEPTION_POINTERS* ep, VOID *pnTestInt) return EXCEPTION_EXECUTE_HANDLER; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_EX_test2_paltest_pal_except_filter_ex_test2, "exception_handling/PAL_EXCEPT_FILTER_EX/test2/paltest_pal_except_filter_ex_test2") { int* p = 0x00000000; BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/testinfo.dat deleted file mode 100644 index 4c5c5b2d606..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER_EX -Name = Test for PAL_EXCEPT_FILTER_EX -Type = DEFAULT -EXE1 = pal_except_filter_ex -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER_EX. -= There is a nested try blocks in this test. The nested -= PAL_TRY creates an exception and the FILTER creates another. -= This test makes sure that this case does not end in a -= infinite loop. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt deleted file mode 100644 index 31107993f93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_except_filter.cpp -) - -add_executable(paltest_pal_except_filter_ex_test3 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_filter_ex_test3 coreclrpal) - -target_link_libraries(paltest_pal_except_filter_ex_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp index bb0be8b3038..815b4d84d10 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp @@ -68,7 +68,7 @@ LONG ExecExeptionFilter(EXCEPTION_POINTERS* ep, LPVOID pnTestInt) return EXCEPTION_EXECUTE_HANDLER; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_EXCEPT_FILTER_EX_test3_paltest_pal_except_filter_ex_test3, "exception_handling/PAL_EXCEPT_FILTER_EX/test3/paltest_pal_except_filter_ex_test3") { int* p = 0x00000000; /* pointer to NULL */ BOOL bExcept1 = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/testinfo.dat deleted file mode 100644 index ae6093b1dbe..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_EXCEPT_FILTER_EX -Name = Test for nested PAL_EXCEPT_FILTER_EX & EXCEPTION_CONTINUE_SEARCH -Type = DEFAULT -EXE1 = pal_except_filter -LANG = cpp -Description -= Tests the PAL implementation of the PAL_EXCEPT_FILTER_EX. An -= exception is forced and passed to two nested exception filters for -= consideration. The first filter returns EXCEPTION_CONTINUE_SEARCH -= so the second can run and return EXCEPTION_EXECUTE_HANDLER. The -= initial exception handler should be skipped, and the second -= executed diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt deleted file mode 100644 index 867b02876f4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_EXCEPT.cpp -) - -add_executable(paltest_pal_try_except_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_except_test1 coreclrpal) - -target_link_libraries(paltest_pal_try_except_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp index eb2bbce1ee6..a05fd5c8c98 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_EXCEPT_test1_paltest_pal_try_except_test1, "exception_handling/PAL_TRY_EXCEPT/test1/paltest_pal_try_except_test1") { int* p = 0x00000000; /* NULL pointer */ BOOL bTry = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/testinfo.dat deleted file mode 100644 index 7108fe259f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_TRY and PAL_EXCEPT -Name = Test for PAL_TRY and PAL_EXCEPT -Type = DEFAULT -EXE1 = pal_try_except -LANG = cpp -Description -= Since these two are so closely connected, they are tested together. -= In the PAL_TRY block, an access violation is forced to gain -= access to the PAL_EXCEPT block. Booleans are used to ensure -= each of the code blocks are hit. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt deleted file mode 100644 index 81089fd479f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_EXCEPT.cpp -) - -add_executable(paltest_pal_try_except_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_except_test2 coreclrpal) - -target_link_libraries(paltest_pal_try_except_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp index baf4533bd8a..b4bdd51bf53 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_EXCEPT_test2_paltest_pal_try_except_test2, "exception_handling/PAL_TRY_EXCEPT/test2/paltest_pal_try_except_test2") { BOOL bTry = FALSE; BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/testinfo.dat deleted file mode 100644 index 8ccdd101a19..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_TRY and PAL_EXCEPT (test 2) -Name = Test for PAL_TRY and PAL_EXCEPT -Type = DEFAULT -EXE1 = pal_try_except -LANG = cpp -Description -= Since these two are so closely connected, they are tested together. -= In this test, no exceptions are forced to ensure the EXCEPTION block -= isn't hit. Booleans are used to ensure the proper code blocks are hit. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt deleted file mode 100644 index 1969986fb71..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_EXCEPT_EX.cpp -) - -add_executable(paltest_pal_try_except_ex_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_except_ex_test1 coreclrpal) - -target_link_libraries(paltest_pal_try_except_ex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp index 2225f46aab6..ed33957aea7 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_EXCEPT_EX_test1_paltest_pal_try_except_ex_test1, "exception_handling/PAL_TRY_EXCEPT_EX/test1/paltest_pal_try_except_ex_test1") { int* p = 0x00000000; /* NULL pointer */ BOOL bTry = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/testinfo.dat deleted file mode 100644 index afb31350006..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_TRY and PAL_EXCEPT_EX -Name = Test for PAL_TRY and PAL_EXCEPT_EX -Type = DEFAULT -EXE1 = pal_try_except_ex -LANG = cpp -Description -= Since these two are so closely connected, they are tested together. -= In the PAL_TRY block, an access violation is forced to gain -= access to the PAL_EXCEPT block. Booleans are used to ensure -= each of the code blocks are hit. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt deleted file mode 100644 index 00a0985373a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_EXCEPT_EX.cpp -) - -add_executable(paltest_pal_try_except_ex_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_except_ex_test2 coreclrpal) - -target_link_libraries(paltest_pal_try_except_ex_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp index c56552d4b59..4d06875f337 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_EXCEPT_EX_test2_paltest_pal_try_except_ex_test2, "exception_handling/PAL_TRY_EXCEPT_EX/test2/paltest_pal_try_except_ex_test2") { BOOL bTry = FALSE; BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/testinfo.dat deleted file mode 100644 index 79d5b8b2230..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_TRY and PAL_EXCEPT_EX (test 2) -Name = Test for PAL_TRY and PAL_EXCEPT_EX -Type = DEFAULT -EXE1 = pal_try_except_ex -LANG = cpp -Description -= Since these two are so closely connected, they are tested together. -= In this test, no exceptions are forced to ensure the EXCEPTION block -= isn't hit. Booleans are used to ensure the proper code blocks are hit. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt deleted file mode 100644 index d56169e8682..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_EXCEPT_EX.cpp -) - -add_executable(paltest_pal_try_except_ex_test3 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_except_ex_test3 coreclrpal) - -target_link_libraries(paltest_pal_try_except_ex_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp index 7e4d97f11ec..ccf5efabeb2 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_EXCEPT_EX_test3_paltest_pal_try_except_ex_test3, "exception_handling/PAL_TRY_EXCEPT_EX/test3/paltest_pal_try_except_ex_test3") { int* p = 0x00000000; /* NULL pointer */ BOOL bTry = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/testinfo.dat deleted file mode 100644 index 99d74e1f435..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_TRY and PAL_EXCEPT_EX (test3) -Name = Test for PAL_TRY and PAL_EXCEPT_EX -Type = DEFAULT -EXE1 = pal_try_except_ex -LANG = cpp -Description -= Since these two are so closely connected, they are tested together. -= Only one of the PAL_TRY blocks will force and exception to ensure the -= correct PAL_EXCEPT_EX block is hit. Booleans are used to ensure -= the correct code blocks are hit. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt deleted file mode 100644 index 9a8175353d0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_TRY_LEAVE_FINALLY.cpp -) - -add_executable(paltest_pal_try_leave_finally_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_try_leave_finally_test1 coreclrpal) - -target_link_libraries(paltest_pal_try_leave_finally_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp index b5de993e5b3..ed866aaa287 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_PAL_TRY_LEAVE_FINALLY_test1_paltest_pal_try_leave_finally_test1, "exception_handling/PAL_TRY_LEAVE_FINALLY/test1/paltest_pal_try_leave_finally_test1") { BOOL bTry = FALSE; BOOL bFinally = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/testinfo.dat deleted file mode 100644 index 22e7f4fd505..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = PAL_TRY, PAL_LEAVE and PAL_FINALLY -Name = Test for PAL_TRY, PAL_LEAVE and PAL_EXCEPT -Type = DEFAULT -EXE1 = pal_try_leave_finally -LANG = cpp -Description -= Since these three are so closely connected, they are tested together. -= The PAL_TRY block contains a PAL_LEAVE which kicks execution to -= the PAL_FINALLY block. Booleans are used to ensure each of the -= code blocks are properly hit. - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt deleted file mode 100644 index f0c98f7e2b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_raiseexception_test1 - ${SOURCES} -) - -add_dependencies(paltest_raiseexception_test1 coreclrpal) - -target_link_libraries(paltest_raiseexception_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/test1.cpp index 22ffbc0c030..81cfa59fb77 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/test1.cpp @@ -15,11 +15,11 @@ #include <palsuite.h> -BOOL bExcept = FALSE; -BOOL bTry = FALSE; -BOOL bFinally = FALSE; +BOOL bExcept_RaiseException_test1 = FALSE; +BOOL bTry_RaiseException_test1 = FALSE; +BOOL bFinally_RaiseException_test1 = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_RaiseException_test1_paltest_raiseexception_test1, "exception_handling/RaiseException/test1/paltest_raiseexception_test1") { if(0 != (PAL_Initialize(argc, argv))) @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) */ PAL_TRY(VOID*, unused, NULL) { - bTry = TRUE; + bTry_RaiseException_test1 = TRUE; RaiseException(0,0,0,0); Fail("RaiseException: ERROR -> code was executed after the " @@ -40,42 +40,42 @@ int __cdecl main(int argc, char *argv[]) } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - bExcept = TRUE; + bExcept_RaiseException_test1 = TRUE; } PAL_ENDTRY; - if (!bTry) + if (!bTry_RaiseException_test1) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_RaiseException_test1) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT_FILTER_EX block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept) + if(!bTry_RaiseException_test1 || !bExcept_RaiseException_test1) { Fail(""); } /* Reinit flags */ - bTry = bExcept = FALSE; + bTry_RaiseException_test1 = bExcept_RaiseException_test1 = FALSE; /********************************************************* * Tests the behaviour of RaiseException with * PAL_FINALLY - * (bFinally should be set before bExcept) + * (bFinally_RaiseException_test1 should be set before bExcept_RaiseException_test1) */ PAL_TRY(VOID*, unused, NULL) { PAL_TRY(VOID*, unused, NULL) { - bTry = TRUE; + bTry_RaiseException_test1 = TRUE; RaiseException(0,0,0,0); Fail("RaiseException: ERROR -> code was executed after the " @@ -83,43 +83,43 @@ int __cdecl main(int argc, char *argv[]) } PAL_FINALLY { - bFinally = TRUE; + bFinally_RaiseException_test1 = TRUE; } PAL_ENDTRY; } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if( bFinally == FALSE ) + if( bFinally_RaiseException_test1 == FALSE ) { Fail("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT executed before the code in PAL_FINALLY.\n"); } - bExcept = TRUE; + bExcept_RaiseException_test1 = TRUE; } PAL_ENDTRY; - if (!bTry) + if (!bTry_RaiseException_test1) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_RaiseException_test1) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT block was not executed.\n"); } - if (!bFinally) + if (!bFinally_RaiseException_test1) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_FINALLY block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || !bFinally) + if(!bTry_RaiseException_test1 || !bExcept_RaiseException_test1 || !bFinally_RaiseException_test1) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/testinfo.dat deleted file mode 100644 index 8dc343012a5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = RaiseException -Name = RaiseException test #1 -TYPE = DEFAULT -EXE1 = test1 -LANG = cpp -Description -=Tests that RaiseException throws a catchable exception diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt deleted file mode 100644 index 71968b96574..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_raiseexception_test2 - ${SOURCES} -) - -add_dependencies(paltest_raiseexception_test2 coreclrpal) - -target_link_libraries(paltest_raiseexception_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/test2.cpp index e5a85fe6adc..e55a41bd596 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/test2.cpp @@ -17,15 +17,15 @@ #include <palsuite.h> -BOOL bFilter; -BOOL bTry; -BOOL bExcept; +BOOL bFilter_RaiseException_test2; +BOOL bTry_RaiseException_test2; +BOOL bExcept_RaiseException_test2; -ULONG_PTR lpArguments_test1[EXCEPTION_MAXIMUM_PARAMETERS]; -DWORD nArguments_test1 = EXCEPTION_MAXIMUM_PARAMETERS; +ULONG_PTR lpArguments_test1_RaiseException_test2[EXCEPTION_MAXIMUM_PARAMETERS]; +DWORD nArguments_test1_RaiseException_test2 = EXCEPTION_MAXIMUM_PARAMETERS; -ULONG_PTR lpArguments_test2[EXCEPTION_MAXIMUM_PARAMETERS+1]; -DWORD nArguments_test2 = EXCEPTION_MAXIMUM_PARAMETERS+1; +ULONG_PTR lpArguments_test2_RaiseException_test2[EXCEPTION_MAXIMUM_PARAMETERS+1]; +DWORD nArguments_test2_RaiseException_test2 = EXCEPTION_MAXIMUM_PARAMETERS+1; /** @@ -33,14 +33,14 @@ DWORD nArguments_test2 = EXCEPTION_MAXIMUM_PARAMETERS+1; ** Filter function that checks for the parameters ** **/ -LONG Filter_test1(EXCEPTION_POINTERS* ep, VOID *unused) +LONG Filter_test1_RaiseException_test2(EXCEPTION_POINTERS* ep, VOID *unused) { int i; /* let the main know we've hit the filter function */ - bFilter = TRUE; + bFilter_RaiseException_test2 = TRUE; - if (!bTry) + if (!bTry_RaiseException_test2) { Fail("PAL_EXCEPT_FILTER_EX: ERROR -> Something weird is going on." " The filter was hit without PAL_TRY being hit.\n"); @@ -48,26 +48,26 @@ LONG Filter_test1(EXCEPTION_POINTERS* ep, VOID *unused) /* was the correct number of arguments passed */ - if (ep->ExceptionRecord->NumberParameters != (DWORD) nArguments_test1) + if (ep->ExceptionRecord->NumberParameters != (DWORD) nArguments_test1_RaiseException_test2) { Fail("RaiseException: ERROR -> Number of arguments passed to filter" " was %d when it should have been %d", ep->ExceptionRecord->NumberParameters, - nArguments_test1); + nArguments_test1_RaiseException_test2); } /* were the correct arguments passed */ - for( i=0; ((DWORD)i)<nArguments_test1; i++ ) + for( i=0; ((DWORD)i)<nArguments_test1_RaiseException_test2; i++ ) { if( ep->ExceptionRecord->ExceptionInformation[i] - != lpArguments_test1[i]) + != lpArguments_test1_RaiseException_test2[i]) { Fail("RaiseException: ERROR -> Argument %d passed to filter" " was %d when it should have been %d", i, ep->ExceptionRecord->ExceptionInformation[i], - lpArguments_test1[i]); + lpArguments_test1_RaiseException_test2[i]); } } @@ -79,10 +79,10 @@ LONG Filter_test1(EXCEPTION_POINTERS* ep, VOID *unused) ** Filter function that checks for the maximum parameters ** **/ -LONG Filter_test2(EXCEPTION_POINTERS* ep, VOID* unused) +LONG Filter_test2_RaiseException_test2(EXCEPTION_POINTERS* ep, VOID* unused) { /* let the main know we've hit the filter function */ - bFilter = TRUE; + bFilter_RaiseException_test2 = TRUE; if (ep->ExceptionRecord->NumberParameters > EXCEPTION_MAXIMUM_PARAMETERS) { @@ -95,9 +95,9 @@ LONG Filter_test2(EXCEPTION_POINTERS* ep, VOID* unused) return EXCEPTION_EXECUTE_HANDLER; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_RaiseException_test2_paltest_raiseexception_test2, "exception_handling/RaiseException/test2/paltest_raiseexception_test2") { - bExcept = FALSE; + bExcept_RaiseException_test2 = FALSE; if (0 != PAL_Initialize(argc, argv)) { @@ -110,57 +110,57 @@ int __cdecl main(int argc, char *argv[]) */ PAL_TRY(VOID*, unused, NULL) { - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_RaiseException_test2 = TRUE; /* indicate we hit the PAL_TRY block */ /* Initialize arguments to pass to filter */ - for(int i = 0; ((DWORD)i) < nArguments_test1; i++ ) + for(int i = 0; ((DWORD)i) < nArguments_test1_RaiseException_test2; i++ ) { - lpArguments_test1[i] = i; + lpArguments_test1_RaiseException_test2[i] = i; } - RaiseException(0,0,nArguments_test1,lpArguments_test1); + RaiseException(0,0,nArguments_test1_RaiseException_test2,lpArguments_test1_RaiseException_test2); Fail("RaiseException: ERROR -> code was executed after the " "exception was raised.\n"); } - PAL_EXCEPT_FILTER(Filter_test1) + PAL_EXCEPT_FILTER(Filter_test1_RaiseException_test2) { - if (!bTry) + if (!bTry_RaiseException_test2) { Fail("RaiseException: ERROR -> Something weird is going on." " PAL_EXCEPT_FILTER was hit without PAL_TRY being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ + bExcept_RaiseException_test2 = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT_FILTER_EX block was not executed.\n"); } - if (!bFilter) + if (!bFilter_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the" " filter function was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || !bFilter) + if(!bTry_RaiseException_test2 || !bExcept_RaiseException_test2 || !bFilter_RaiseException_test2) { Fail(""); } /* Reinit flags */ - bTry = bExcept = bFilter = FALSE; + bTry_RaiseException_test2 = bExcept_RaiseException_test2 = bFilter_RaiseException_test2 = FALSE; /******************************************************** * Test that the number of arguments never @@ -169,50 +169,50 @@ int __cdecl main(int argc, char *argv[]) */ PAL_TRY(VOID*, unused, NULL) { - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_RaiseException_test2 = TRUE; /* indicate we hit the PAL_TRY block */ /* Initialize arguments to pass to filter */ - for(int i = 0; ((DWORD)i) < nArguments_test2; i++ ) + for(int i = 0; ((DWORD)i) < nArguments_test2_RaiseException_test2; i++ ) { - lpArguments_test2[i] = i; + lpArguments_test2_RaiseException_test2[i] = i; } - RaiseException(0,0,nArguments_test2,lpArguments_test2); + RaiseException(0,0,nArguments_test2_RaiseException_test2,lpArguments_test2_RaiseException_test2); Fail("RaiseException: ERROR -> code was executed after the " "exception was raised.\n"); } - PAL_EXCEPT_FILTER(Filter_test2) + PAL_EXCEPT_FILTER(Filter_test2_RaiseException_test2) { - if (!bTry) + if (!bTry_RaiseException_test2) { Fail("RaiseException: ERROR -> Something weird is going on." " PAL_EXCEPT_FILTER was hit without PAL_TRY being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ + bExcept_RaiseException_test2 = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT_FILTER_EX block was not executed.\n"); } - if (!bFilter) + if (!bFilter_RaiseException_test2) { Trace("RaiseException: ERROR -> It appears the code in the" " filter function was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || !bFilter) + if(!bTry_RaiseException_test2 || !bExcept_RaiseException_test2 || !bFilter_RaiseException_test2) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/testinfo.dat deleted file mode 100644 index 8d59d41a2ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test2/testinfo.dat +++ /dev/null @@ -1,27 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = RaiseException - -Name = RaiseException test #2 - -TYPE = DEFAULT - -EXE1 = test2 -LANG = cpp - -Description - -=Tests that the correct arguments are passed - -=to the filter by RaiseException and tests that - -=the number of arguments never exceeds - -=EXCEPTION_MAXIMUM_PARAMETERS, even though we - -=pass a greater number of arguments diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt deleted file mode 100644 index 72b79365b03..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_raiseexception_test3 - ${SOURCES} -) - -add_dependencies(paltest_raiseexception_test3 coreclrpal) - -target_link_libraries(paltest_raiseexception_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/test.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/test.cpp index 47199b55fa2..d0f98e3f5c3 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/test.cpp @@ -14,21 +14,21 @@ #include <palsuite.h> -BOOL bFilter = FALSE; -BOOL bTry = FALSE; -BOOL bExcept = FALSE; +BOOL bFilter_RaiseException_test3 = FALSE; +BOOL bTry_RaiseException_test3 = FALSE; +BOOL bExcept_RaiseException_test3 = FALSE; /** ** ** Filter function that checks for the parameters ** **/ -LONG Filter_test1(EXCEPTION_POINTERS* ep, VOID* unused) +LONG Filter_test1_RaiseException_test3(EXCEPTION_POINTERS* ep, VOID* unused) { /* let the main know we've hit the filter function */ - bFilter = TRUE; + bFilter_RaiseException_test3 = TRUE; - if (!bTry) + if (!bTry_RaiseException_test3) { Fail("PAL_EXCEPT_FILTER_EX: ERROR -> Something weird is going on." " The filter was hit without PAL_TRY being hit.\n"); @@ -48,9 +48,9 @@ LONG Filter_test1(EXCEPTION_POINTERS* ep, VOID* unused) return EXCEPTION_EXECUTE_HANDLER; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_RaiseException_test3_paltest_raiseexception_test3, "exception_handling/RaiseException/test3/paltest_raiseexception_test3") { - bExcept = FALSE; + bExcept_RaiseException_test3 = FALSE; if (0 != PAL_Initialize(argc, argv)) { @@ -63,7 +63,7 @@ int __cdecl main(int argc, char *argv[]) */ PAL_TRY(VOID*, unused, NULL) { - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_RaiseException_test3 = TRUE; /* indicate we hit the PAL_TRY block */ RaiseException(EXCEPTION_ARRAY_BOUNDS_EXCEEDED, 0, @@ -72,37 +72,37 @@ int __cdecl main(int argc, char *argv[]) Fail("RaiseException: ERROR -> code was executed after the " "exception was raised.\n"); } - PAL_EXCEPT_FILTER(Filter_test1) + PAL_EXCEPT_FILTER(Filter_test1_RaiseException_test3) { - if (!bTry) + if (!bTry_RaiseException_test3) { Fail("RaiseException: ERROR -> Something weird is going on." " PAL_EXCEPT_FILTER was hit without PAL_TRY being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ + bExcept_RaiseException_test3 = TRUE; /* indicate we hit the PAL_EXCEPT_FILTER_EX block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_RaiseException_test3) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_RaiseException_test3) { Trace("RaiseException: ERROR -> It appears the code in the " "PAL_EXCEPT_FILTER_EX block was not executed.\n"); } - if (!bFilter) + if (!bFilter_RaiseException_test3) { Trace("RaiseException: ERROR -> It appears the code in the" " filter function was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || !bFilter) + if(!bTry_RaiseException_test3 || !bExcept_RaiseException_test3 || !bFilter_RaiseException_test3) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/testinfo.dat deleted file mode 100644 index fe650592402..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/RaiseException/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = RaiseException -Name = RaiseException test #3 -TYPE = DEFAULT -EXE1 = test -LANG = cpp -Description -= Tests that the exception code passed to -= RaiseException makes it to the filter. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/CMakeLists.txt deleted file mode 100644 index 7cd88f8e86d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt deleted file mode 100644 index d0d8476bc79..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_pal_except_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test1 coreclrpal) - -target_link_libraries(paltest_pal_except_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp index 809c9bba5bd..35632612d50 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp @@ -13,10 +13,10 @@ #include <palsuite.h> /* Execution flags */ -BOOL bTry = FALSE; -BOOL bExcept = FALSE; +BOOL bTry_pal_except_test1 = FALSE; +BOOL bExcept_pal_except_test1 = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test1_paltest_pal_except_test1, "exception_handling/pal_except/test1/paltest_pal_except_test1") { if (0 != PAL_Initialize(argc, argv)) { @@ -27,34 +27,34 @@ int __cdecl main(int argc, char *argv[]) { int* p = 0x00000000; /* NULL pointer */ - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_pal_except_test1 = TRUE; /* indicate we hit the PAL_TRY block */ *p = 13; /* causes an access violation exception */ Fail("ERROR: code was executed after the access violation.\n"); } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_pal_except_test1) { Fail("ERROR: PAL_EXCEPT was hit without PAL_TRY being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT block */ + bExcept_pal_except_test1 = TRUE; /* indicate we hit the PAL_EXCEPT block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_pal_except_test1) { Trace("ERROR: the code in the PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_pal_except_test1) { Trace("ERROR: the code in the PAL_EXCEPT block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept) + if(!bTry_pal_except_test1 || !bExcept_pal_except_test1) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/testinfo.dat deleted file mode 100644 index 5c2a4849ebd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test1/testinfo.dat +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT - -Name = Test for PAL_TRY and PAL_EXCEPT - -Type = DEFAULT - -EXE1 = test1 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT block is executed - -= after an exception occurs in the PAL_TRY block diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt deleted file mode 100644 index 908b485b2ec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_pal_except_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test2 coreclrpal) - -target_link_libraries(paltest_pal_except_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp index 68238c4e1e9..3724f8fecf9 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp @@ -14,12 +14,12 @@ #include <palsuite.h> /* Execution flags */ -BOOL bTry = FALSE; -BOOL bExcept = FALSE; -BOOL bTry_nested = FALSE; -BOOL bExcept_nested = FALSE; +BOOL bTry_pal_except_test2 = FALSE; +BOOL bExcept_pal_except_test2 = FALSE; +BOOL bTry_nested_pal_except_test2 = FALSE; +BOOL bExcept_nested_pal_except_test2 = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test2_paltest_pal_except_test2, "exception_handling/pal_except/test2/paltest_pal_except_test2") { if (0 != PAL_Initialize(argc, argv)) { @@ -30,13 +30,13 @@ int __cdecl main(int argc, char *argv[]) { int* p = 0x00000000; /* NULL pointer */ - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_pal_except_test2 = TRUE; /* indicate we hit the PAL_TRY block */ /* Nested PAL_TRY */ PAL_TRY { - bTry_nested = TRUE; + bTry_nested_pal_except_test2 = TRUE; *p = 13; /* causes an access violation exception */ @@ -45,12 +45,12 @@ int __cdecl main(int argc, char *argv[]) } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_pal_except_test2) { Fail("ERROR: Nested PAL_EXCEPT was hit without " "nested PAL_TRY being hit.\n"); } - bExcept_nested = TRUE; + bExcept_nested_pal_except_test2 = TRUE; } PAL_ENDTRY; @@ -60,45 +60,45 @@ int __cdecl main(int argc, char *argv[]) } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_pal_except_test2) { Fail("ERROR: PAL_EXCEPT was hit without PAL_TRY being hit.\n"); } - if (!bExcept_nested) + if (!bExcept_nested_pal_except_test2) { Fail("ERROR: PAL_EXCEPT was hit without " "nested PAL_EXCEPT being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT block */ + bExcept_pal_except_test2 = TRUE; /* indicate we hit the PAL_EXCEPT block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_pal_except_test2) { Trace("ERROR: the code in the PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_pal_except_test2) { Trace("ERROR: the code in the PAL_EXCEPT block was not executed.\n"); } - if (!bTry_nested) + if (!bTry_nested_pal_except_test2) { Trace("ERROR: the code in the " "nested PAL_TRY block was not executed.\n"); } - if (!bExcept_nested) + if (!bExcept_nested_pal_except_test2) { Trace("ERROR: the code in the " "nested PAL_EXCEPT block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || - !bTry_nested || !bExcept_nested) + if(!bTry_pal_except_test2 || !bExcept_pal_except_test2 || + !bTry_nested_pal_except_test2 || !bExcept_nested_pal_except_test2) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/testinfo.dat deleted file mode 100644 index 6aa28db3527..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test2/testinfo.dat +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT_EX - -Name = Test for PAL_TRY and PAL_EXCEPT_EX - -Type = DEFAULT - -EXE1 = test2 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT_EX block is executed - -= after an exception occurs in the PAL_TRY block - -= that contains another PAL_TRY-PAL_EXCEPT_EX block diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt deleted file mode 100644 index c3ab8397649..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_pal_except_test3 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test3 coreclrpal) - -target_link_libraries(paltest_pal_except_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp index 0e6b2641d14..926af9b92a7 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> /* Execution flags */ -BOOL bTry = FALSE; -BOOL bExcept = FALSE; -BOOL bTry_function = FALSE; -BOOL bExcept_function = FALSE; +BOOL bTry_pal_except_test3 = FALSE; +BOOL bExcept_pal_except_test3 = FALSE; +BOOL bTry_function_pal_except_test3 = FALSE; +BOOL bExcept_function_pal_except_test3 = FALSE; /* * Helper function that contains a PAL_TRY-PAL_EXCEPT block @@ -30,7 +30,7 @@ void Helper() { int *lp = 0x00000000; - bTry_function = TRUE; + bTry_function_pal_except_test3 = TRUE; *lp = 13; /* causes an access violation exception */ @@ -39,17 +39,17 @@ void Helper() } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_pal_except_test3) { Fail("ERROR: Nested PAL_EXCEPT was hit without " "the function's PAL_TRY being hit.\n"); } - bExcept_function = TRUE; + bExcept_function_pal_except_test3 = TRUE; } PAL_ENDTRY; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test3_paltest_pal_except_test3, "exception_handling/pal_except/test3/paltest_pal_except_test3") { if (0 != PAL_Initialize(argc, argv)) { @@ -60,7 +60,7 @@ int __cdecl main(int argc, char *argv[]) { int* p = 0x00000000; /* NULL pointer */ - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_pal_except_test3 = TRUE; /* indicate we hit the PAL_TRY block */ Helper(); @@ -70,45 +70,45 @@ int __cdecl main(int argc, char *argv[]) } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_pal_except_test3) { Fail("ERROR: PAL_EXCEPT was hit without PAL_TRY being hit.\n"); } - if (!bExcept_function) + if (!bExcept_function_pal_except_test3) { Fail("ERROR: PAL_EXCEPT was hit without " "function's PAL_EXCEPT being hit.\n"); } - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT block */ + bExcept_pal_except_test3 = TRUE; /* indicate we hit the PAL_EXCEPT block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_pal_except_test3) { Trace("ERROR: the code in the PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_pal_except_test3) { Trace("ERROR: the code in the PAL_EXCEPT block was not executed.\n"); } - if (!bTry_function) + if (!bTry_function_pal_except_test3) { Trace("ERROR: the code in the " "function's PAL_TRY block was not executed.\n"); } - if (!bExcept_function) + if (!bExcept_function_pal_except_test3) { Trace("ERROR: the code in the " "function's PAL_EXCEPT block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || - !bTry_function || !bExcept_function) + if(!bTry_pal_except_test3 || !bExcept_pal_except_test3 || + !bTry_function_pal_except_test3 || !bExcept_function_pal_except_test3) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/testinfo.dat deleted file mode 100644 index 348940e6a27..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test3/testinfo.dat +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT - -Name = Test for PAL_TRY and PAL_EXCEPT - -Type = DEFAULT - -EXE1 = test3 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT block is executed - -= after an exception occurs in the PAL_TRY block - -= that calls a function that contains - -= another PAL_TRY-PAL_EXCEPT block diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt deleted file mode 100644 index 493845cdbc8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_pal_except_test4 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test4 coreclrpal) - -target_link_libraries(paltest_pal_except_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp index 386f5024389..ba2151a61cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp @@ -15,12 +15,12 @@ #include <palsuite.h> /* Execution flags */ -BOOL bTry = FALSE; -BOOL bExcept = FALSE; -BOOL bTry_nested = FALSE; -BOOL bExcept_nested = FALSE; +BOOL bTry_palexcept_test4 = FALSE; +BOOL bExcept_palexcept_test4 = FALSE; +BOOL bTry_nested_palexcept_test4 = FALSE; +BOOL bExcept_nested_palexcept_test4 = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test4_paltest_pal_except_test4, "exception_handling/pal_except/test4/paltest_pal_except_test4") { if (0 != PAL_Initialize(argc, argv)) { @@ -31,14 +31,14 @@ int __cdecl main(int argc, char *argv[]) { int* p = 0x00000000; /* NULL pointer */ - bTry = TRUE; /* indicate we hit the PAL_TRY block */ + bTry_palexcept_test4 = TRUE; /* indicate we hit the PAL_TRY block */ *p = 13; /* causes an access violation exception */ Fail("ERROR: code was executed after the access violation.\n"); } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry) + if (!bTry_palexcept_test4) { Fail("ERROR: PAL_EXCEPT was hit without PAL_TRY being hit.\n"); } @@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[]) { int *lp = 0x00000000; - bTry_nested = TRUE; + bTry_nested_palexcept_test4 = TRUE; *lp = 13; /* causes an access violation exception */ Fail("ERROR: code was executed after the " @@ -55,44 +55,44 @@ int __cdecl main(int argc, char *argv[]) } PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (!bTry_nested) + if (!bTry_nested_palexcept_test4) { Fail("ERROR: PAL_EXCEPT was hit without PAL_TRY being hit " "in the nested block.\n"); } - bExcept_nested = TRUE; + bExcept_nested_palexcept_test4 = TRUE; } PAL_ENDTRY; - bExcept = TRUE; /* indicate we hit the PAL_EXCEPT block */ + bExcept_palexcept_test4 = TRUE; /* indicate we hit the PAL_EXCEPT block */ } PAL_ENDTRY; - if (!bTry) + if (!bTry_palexcept_test4) { Trace("ERROR: the code in the PAL_TRY block was not executed.\n"); } - if (!bExcept) + if (!bExcept_palexcept_test4) { Trace("ERROR: the code in the PAL_EXCEPT block was not executed.\n"); } - if (!bTry_nested) + if (!bTry_nested_palexcept_test4) { Trace("ERROR: the code in the nested " "PAL_TRY block was not executed.\n"); } - if (!bExcept_nested) + if (!bExcept_nested_palexcept_test4) { Trace("ERROR: the code in the nested " "PAL_EXCEPT block was not executed.\n"); } /* did we hit all the code blocks? */ - if(!bTry || !bExcept || - !bTry_nested || !bExcept_nested) + if(!bTry_palexcept_test4 || !bExcept_palexcept_test4 || + !bTry_nested_palexcept_test4 || !bExcept_nested_palexcept_test4) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/testinfo.dat deleted file mode 100644 index 3f761bc2487..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test4/testinfo.dat +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT - -Name = Test for PAL_TRY and PAL_EXCEPT - -Type = DEFAULT - -EXE1 = test4 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT block is executed - -= after an exception occurs in the PAL_TRY block - -= if the PAL_EXCEPT block contains a nested - -= PAL_TRY-PAL_EXCEPT block diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt deleted file mode 100644 index 5b6b8dc3f4b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_pal_except_test5 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test5 coreclrpal) - -target_link_libraries(paltest_pal_except_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp index 97ee1d8d281..4872226f3ea 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp @@ -20,7 +20,7 @@ BOOL bExcept = FALSE; BOOL bTry_nested = FALSE; BOOL bExcept_nested = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test5_paltest_pal_except_test5, "exception_handling/pal_except/test5/paltest_pal_except_test5") { if (0 != PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/testinfo.dat deleted file mode 100644 index 9ff2fbfb8b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test5/testinfo.dat +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT - -Name = Test for PAL_TRY and PAL_EXCEPT - -Type = DEFAULT - -EXE1 = test5 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT block is executed - -= after an exception occurs in the PAL_TRY block - -= if the PAL_EXCEPT block calls a function that contains - -= another PAL_TRY-PAL_EXCEPT block diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt deleted file mode 100644 index e74367388c7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_pal_except_test6 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test6 coreclrpal) - -target_link_libraries(paltest_pal_except_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp index c3fc8547690..89c360d7e85 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp @@ -22,7 +22,7 @@ BOOL bTry_nested2 = FALSE; BOOL bExcept_nested2 = FALSE; -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test6_paltest_pal_except_test6, "exception_handling/pal_except/test6/paltest_pal_except_test6") { if (0 != PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/testinfo.dat deleted file mode 100644 index 5d6006cef6d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test6/testinfo.dat +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT_EX - -Name = Test for PAL_TRY and PAL_EXCEPT_EX - -Type = DEFAULT - -EXE1 = test6 - -LANG = cpp - -Description - -= Test to make sure the PAL_EXCEPT_EX block is executed - -= after an exception occurs in the PAL_TRY block - -= that contains multiple PAL_TRY-PAL_EXCEPT_EX blocks diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt deleted file mode 100644 index 40ffaeafd6a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_pal_except_test7 - ${SOURCES} -) - -add_dependencies(paltest_pal_except_test7 coreclrpal) - -target_link_libraries(paltest_pal_except_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp index cc43f4ee2a0..b1c90af044e 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_except_test7_paltest_pal_except_test7, "exception_handling/pal_except/test7/paltest_pal_except_test7") { BOOL bTry = FALSE; BOOL bExcept = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/testinfo.dat deleted file mode 100644 index 97cdfa4ba75..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_except/test7/testinfo.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = exception_handling - -Function = PAL_TRY and PAL_EXCEPT - -Name = Test for PAL_TRY and PAL_EXCEPT - -Type = DEFAULT - -EXE1 = test7 - -LANG = cpp - -Description - -= In this test, no exceptions are forced to ensure the EXCEPTION block - -= isn't hit. - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt deleted file mode 100644 index db29fcab185..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_finally.cpp -) - -add_executable(paltest_pal_finally_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_finally_test1 coreclrpal) - -target_link_libraries(paltest_pal_finally_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp index 423355b2d68..2a23e4ed3c3 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp @@ -152,7 +152,7 @@ void NestedFunc2 (void) PAL_ENDTRY ; } -int __cdecl main(int argc, char *argv[]) +PALTEST(exception_handling_pal_finally_test1_paltest_pal_finally_test1, "exception_handling/pal_finally/test1/paltest_pal_finally_test1") { if (0 != PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/testinfo.dat deleted file mode 100644 index 66626c2039e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_finally/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = exception_handling -Function = PAL_FINALLY -Name = Test for nested PAL_FINALLY -Type = DEFAULT -EXE1 = pal_finally -LANG = cpp -Description -= Tests the PAL implementation of the PAL_FINALLY in the presence -= of a call stack. An exception is forced and passed to two nested -= exception filters for consideration. The first filter returns -= EXCEPTION_CONTINUE_SEARCH so the second can run and return -= EXCEPTION_EXECUTE_HANDLER. The initial exception handler should -= be skipped, and the second executed, and all the PAL_FINALLY -= blocks handled. diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index d0105b67973..aec809d3fbc 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -23,7 +23,7 @@ if(CLR_CMAKE_HOST_UNIX) endif(CLR_CMAKE_HOST_UNIX) set(DLL1SOURCES dlltest1.cpp) -add_library(paltest_pal_sxs_test1_dll1 SHARED ${DLL1SOURCES}) +_add_library(paltest_pal_sxs_test1_dll1 SHARED ${DLL1SOURCES}) add_custom_target(dlltest1_exports DEPENDS ${EXPORTS_FILE1}) set_property(TARGET paltest_pal_sxs_test1_dll1 APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION1}) set_property(TARGET paltest_pal_sxs_test1_dll1 APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE1}) @@ -55,7 +55,7 @@ if(CLR_CMAKE_TARGET_OSX) endif(CLR_CMAKE_TARGET_OSX) set(DLL2SOURCES dlltest2.cpp) -add_library(paltest_pal_sxs_test1_dll2 SHARED ${DLL2SOURCES}) +_add_library(paltest_pal_sxs_test1_dll2 SHARED ${DLL2SOURCES}) add_custom_target(dlltest2_exports DEPENDS ${EXPORTS_FILE2}) set_property(TARGET paltest_pal_sxs_test1_dll2 APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION2}) set_property(TARGET paltest_pal_sxs_test1_dll2 APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE2}) @@ -72,7 +72,7 @@ target_link_libraries(paltest_pal_sxs_test1_dll2 set(TESTSOURCES exceptionsxs.cpp) -add_executable(paltest_pal_sxs_test1 ${TESTSOURCES}) +_add_executable(paltest_pal_sxs_test1 ${TESTSOURCES}) add_dependencies(paltest_pal_sxs_test1 paltest_pal_sxs_test1_dll1 @@ -83,3 +83,7 @@ target_link_libraries(paltest_pal_sxs_test1 paltest_pal_sxs_test1_dll1 paltest_pal_sxs_test1_dll2 ) + +_install (TARGETS paltest_pal_sxs_test1 DESTINATION paltests/exception_handling/pal_sxs/test1) +_install (TARGETS paltest_pal_sxs_test1_dll1 DESTINATION paltests/exception_handling/pal_sxs/test1) +_install (TARGETS paltest_pal_sxs_test1_dll2 DESTINATION paltests/exception_handling/pal_sxs/test1)
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CMakeLists.txt deleted file mode 100644 index b9b0052cdc0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -add_subdirectory(CopyFileA) -add_subdirectory(CopyFileW) -add_subdirectory(CreateFileA) -add_subdirectory(CreateFileW) -add_subdirectory(DeleteFileA) -add_subdirectory(DeleteFileW) -add_subdirectory(errorpathnotfound) -add_subdirectory(FILECanonicalizePath) -add_subdirectory(FindClose) -add_subdirectory(FindFirstFileA) -add_subdirectory(FindFirstFileW) -add_subdirectory(FindNextFileA) -add_subdirectory(FindNextFileW) -add_subdirectory(FlushFileBuffers) -add_subdirectory(GetConsoleOutputCP) -add_subdirectory(GetCurrentDirectoryA) -add_subdirectory(GetCurrentDirectoryW) -add_subdirectory(GetFileAttributesA) -add_subdirectory(GetFileAttributesExW) -add_subdirectory(GetFileAttributesW) -add_subdirectory(GetFileSize) -add_subdirectory(GetFileSizeEx) -add_subdirectory(GetFullPathNameA) -add_subdirectory(GetFullPathNameW) -add_subdirectory(GetStdHandle) -add_subdirectory(GetSystemTime) -add_subdirectory(GetSystemTimeAsFileTime) -add_subdirectory(GetTempFileNameA) -add_subdirectory(GetTempFileNameW) -add_subdirectory(gettemppatha) -add_subdirectory(GetTempPathW) -add_subdirectory(MoveFileExA) -add_subdirectory(MoveFileExW) -add_subdirectory(ReadFile) -add_subdirectory(SearchPathW) -add_subdirectory(SetEndOfFile) -add_subdirectory(SetFilePointer) -add_subdirectory(WriteFile) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt deleted file mode 100644 index 7c06a0fc1d1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CopyFileA.cpp -) - -add_executable(paltest_copyfilea_test1 - ${SOURCES} -) - -add_dependencies(paltest_copyfilea_test1 coreclrpal) - -target_link_libraries(paltest_copyfilea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp index fcfb463a934..5f11729312f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp @@ -31,7 +31,7 @@ struct TESTS{ }; -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileA_test1_paltest_copyfilea_test1, "file_io/CopyFileA/test1/paltest_copyfilea_test1") { char szSrcExisting[] = {"src_existing.tmp"}; char szSrcNonExistant[] = {"src_non-existant.tmp"}; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/testinfo.dat deleted file mode 100644 index 305e3486f2b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileA -Name = Test for CopyFileA (test 1) -Type = DEFAULT -EXE1 = copyfilea -Description -= Test the CopyFileA function diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt deleted file mode 100644 index 12993509ac6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_copyfilea_test2 - ${SOURCES} -) - -add_dependencies(paltest_copyfilea_test2 coreclrpal) - -target_link_libraries(paltest_copyfilea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp index 60e1ffa280b..73604c03441 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileA_test2_paltest_copyfilea_test2, "file_io/CopyFileA/test2/paltest_copyfilea_test2") { BOOL bRc = TRUE; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/testinfo.dat deleted file mode 100644 index 17f97177121..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileA -Name = CopyFileA - checking copying to itself (test2) -Type = DEFAULT -EXE1 = test2 -Description -= Test the CopyFileA function's behaviour -= for copying a file to itself. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt deleted file mode 100644 index 92316b40d29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_copyfilea_test3 - ${SOURCES} -) - -add_dependencies(paltest_copyfilea_test3 coreclrpal) - -target_link_libraries(paltest_copyfilea_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp index 48ebda2d5fc..37f7601986e 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileA_test3_paltest_copyfilea_test3, "file_io/CopyFileA/test3/paltest_copyfilea_test3") { BOOL bRc = TRUE; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/testinfo.dat deleted file mode 100644 index fde68250de9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileA -Name = CopyFileA - checking file attributes maintained (test2) -Type = DEFAULT -EXE1 = test3 -Description -= Test the CopyFileA function's behaviour -= for copying a file and verifying that -= the copied file has the same file attributes -= as the original. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt deleted file mode 100644 index 71318e8698a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_copyfilea_test4 - ${SOURCES} -) - -add_dependencies(paltest_copyfilea_test4 coreclrpal) - -target_link_libraries(paltest_copyfilea_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp index 05d07eed5d1..bf3e3ec732b 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp @@ -24,7 +24,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileA_test4_paltest_copyfilea_test4, "file_io/CopyFileA/test4/paltest_copyfilea_test4") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/testinfo.dat deleted file mode 100644 index 662c1699912..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileA/test4/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileA -Name = CopyFileA - checking file attributes maintained (test4) -Type = DEFAULT -EXE1 = test4 -Description -= Copy a file from a different user, belonging to a different group to -= the the current user, who is a member of the current group. Then check -= to see that the current user has the basic access rights to the copied -= file. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt deleted file mode 100644 index 182997da420..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CopyFileW.cpp -) - -add_executable(paltest_copyfilew_test1 - ${SOURCES} -) - -add_dependencies(paltest_copyfilew_test1 coreclrpal) - -target_link_libraries(paltest_copyfilew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp index 49e25f1ed94..5a36b3d1126 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp @@ -23,7 +23,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileW_test1_paltest_copyfilew_test1, "file_io/CopyFileW/test1/paltest_copyfilew_test1") { LPSTR lpSource[2] = {"src_existing.tmp", "src_non-existant.tmp"}; LPSTR lpDestination[2] = {"dst_existing.tmp", "dst_non-existant.tmp"}; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/testinfo.dat deleted file mode 100644 index 80eaf917be6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileW -Name = Tests CopyFileW functionality. -Type = DEFAULT -EXE1 = copyfilew -Description -= Test the CopyFileW function - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt deleted file mode 100644 index dc88b3f42b1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_copyfilew_test2 - ${SOURCES} -) - -add_dependencies(paltest_copyfilew_test2 coreclrpal) - -target_link_libraries(paltest_copyfilew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp index 98fb244627e..ce0eea540d2 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileW_test2_paltest_copyfilew_test2, "file_io/CopyFileW/test2/paltest_copyfilew_test2") { LPSTR szSrcExisting = "src_existing.tmp"; WCHAR* wcSource; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/testinfo.dat deleted file mode 100644 index b81c63f7b23..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileW -Name = Tests CopyFileW to check if file can be copied to itself. (test2) -Type = DEFAULT -EXE1 = test2 -Description -= Test the CopyFileW function -= to see the effect of copying a -= file to itself. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt deleted file mode 100644 index f147367b7e9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_copyfilew_test3 - ${SOURCES} -) - -add_dependencies(paltest_copyfilew_test3 coreclrpal) - -target_link_libraries(paltest_copyfilew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp index 739abc9504f..e142e72b3ce 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp @@ -24,7 +24,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CopyFileW_test3_paltest_copyfilew_test3, "file_io/CopyFileW/test3/paltest_copyfilew_test3") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/testinfo.dat deleted file mode 100644 index ef91c318e52..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CopyFileW/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CopyFileW -Name = CopyFileW - checking file attributes maintained (test3) -Type = DEFAULT -EXE1 = test3 -Description -= Copy a file from a different user, belonging to a different group to -= the the current user, who is a member of the current group. Then check -= to see that the current user has the basic access rights to the copied -= file. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt deleted file mode 100644 index ee06026decf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createdirectorya.cpp -) - -add_executable(paltest_createdirectorya_test2 - ${SOURCES} -) - -add_dependencies(paltest_createdirectorya_test2 coreclrpal) - -target_link_libraries(paltest_createdirectorya_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt deleted file mode 100644 index bdc1dfe9744..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createdirectoryw.cpp -) - -add_executable(paltest_createdirectoryw_test2 - ${SOURCES} -) - -add_dependencies(paltest_createdirectoryw_test2 coreclrpal) - -target_link_libraries(paltest_createdirectoryw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt deleted file mode 100644 index 737dfcfbc9b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileA.cpp -) - -add_executable(paltest_createfilea_test1 - ${SOURCES} -) - -add_dependencies(paltest_createfilea_test1 coreclrpal) - -target_link_libraries(paltest_createfilea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp index 21150a0614c..06af62f9f3a 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -BOOL Cleanup(void) +BOOL Cleanup_CreateFileA_test1(void) { char FileName[20]; int i; @@ -31,7 +31,7 @@ BOOL Cleanup(void) } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CreateFileA_test1_paltest_createfilea_test1, "file_io/CreateFileA/test1/paltest_createfilea_test1") { BOOL bSuccess = TRUE; int nCounter = 0; @@ -70,7 +70,7 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - if (!Cleanup()) { + if (!Cleanup_CreateFileA_test1()) { Trace("Pre-test Cleanup() failed. LastError=%d\n", GetLastError()); return FAIL; } @@ -132,7 +132,7 @@ int __cdecl main(int argc, char *argv[]) } } - if (!Cleanup()) + if (!Cleanup_CreateFileA_test1()) { Trace("Post-test Cleanup() failed. LastError=%d\n", GetLastError()); return FAIL; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/testinfo.dat deleted file mode 100644 index 3f3083a78c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CreateFileA -Name = test for CreateFileA -Type = DEFAULT -EXE1 = createfilea -Description -= Attempts to create files based on all combinations of -= options of CreateFileA diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt deleted file mode 100644 index 44fa6507b57..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileW.cpp -) - -add_executable(paltest_createfilew_test1 - ${SOURCES} -) - -add_dependencies(paltest_createfilew_test1 coreclrpal) - -target_link_libraries(paltest_createfilew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp index a861f3d88fa..38d7f5fc9c5 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -BOOL Cleanup(void) +BOOL Cleanup_CreateFileW_test1(void) { char FileName[20]; int i; @@ -31,7 +31,7 @@ BOOL Cleanup(void) } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_CreateFileW_test1_paltest_createfilew_test1, "file_io/CreateFileW/test1/paltest_createfilew_test1") { BOOL bSuccess = TRUE; int nCounter = 0; @@ -72,7 +72,7 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - if (!Cleanup()) { + if (!Cleanup_CreateFileW_test1()) { Trace("Pre-test Cleanup() failed. LastError=%d\n", GetLastError()); return FAIL; } @@ -139,7 +139,7 @@ int __cdecl main(int argc, char *argv[]) } } - if (!Cleanup()) + if (!Cleanup_CreateFileW_test1()) { Trace("Post-test Cleanup() failed. LastError=%d\n", GetLastError()); return FAIL; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/testinfo.dat deleted file mode 100644 index b4028e8a44a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/CreateFileW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = CreateFileW -Name = test for CreateFileW -Type = DEFAULT -EXE1 = createfilew -Description -= Attempts to create files based on all combinations of -= options of CreateFileW diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt deleted file mode 100644 index 3d60e61477f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - DeleteFileA.cpp -) - -add_executable(paltest_deletefilea_test1 - ${SOURCES} -) - -add_dependencies(paltest_deletefilea_test1 coreclrpal) - -target_link_libraries(paltest_deletefilea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/DeleteFileA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/DeleteFileA.cpp index badb3ba8525..606a0f57a59 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/DeleteFileA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/DeleteFileA.cpp @@ -26,7 +26,7 @@ #include <sys/stat.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_DeleteFileA_test1_paltest_deletefilea_test1, "file_io/DeleteFileA/test1/paltest_deletefilea_test1") { FILE *tempFile = NULL; BOOL bRc = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/testinfo.dat deleted file mode 100644 index 5522d285560..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = DeleteFileA -Name = Test for DeleteFileA (test 1) -Type = DEFAULT -EXE1 = deletefilea -Description -= Attempt to delete various files. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt deleted file mode 100644 index c61b1ab0e9a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - DeleteFileW.cpp -) - -add_executable(paltest_deletefilew_test1 - ${SOURCES} -) - -add_dependencies(paltest_deletefilew_test1 coreclrpal) - -target_link_libraries(paltest_deletefilew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp index ef906967020..fa4652f8748 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_DeleteFileW_test1_paltest_deletefilew_test1, "file_io/DeleteFileW/test1/paltest_deletefilew_test1") { FILE *tempFile = NULL; BOOL bRc = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/testinfo.dat deleted file mode 100644 index 78f0fbc2bd9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/DeleteFileW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = DeleteFileW -Name = Test for DeleteFileW (test 1) -Type = DEFAULT -EXE1 = deletefilew -Description -= Tests DeleteFileW on various file names - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt deleted file mode 100644 index 9c4d62206c3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FILECanonicalizePath.cpp -) - -add_executable(paltest_filecanonicalizepath_test1 - ${SOURCES} -) - -add_dependencies(paltest_filecanonicalizepath_test1 coreclrpal) - -target_link_libraries(paltest_filecanonicalizepath_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp index 4661843d780..74daffe3a5a 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp @@ -16,7 +16,7 @@ extern "C" void FILECanonicalizePath(LPSTR lpUnixPath); void TestCase(LPSTR input, LPSTR expectedOutput); -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FILECanonicalizePath_paltest_filecanonicalizepath_test1, "file_io/FILECanonicalizePath/paltest_filecanonicalizepath_test1") { if (PAL_Initialize(argc,argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/testinfo.dat deleted file mode 100644 index c06c21c7588..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FILECanonicalizePath/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FILECanonicalizePath -Name = Test for FILECanonicalizePath (test 1) -Type = DEFAULT -EXE1 = filecanonicalizepath -Description -= Canonicalizes paths and verifies the results diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt deleted file mode 100644 index e8b1b8336a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FindClose.cpp -) - -add_executable(paltest_findclose_test1 - ${SOURCES} -) - -add_dependencies(paltest_findclose_test1 coreclrpal) - -target_link_libraries(paltest_findclose_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp index f9df4b9c077..7226b1d7a06 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp @@ -15,18 +15,18 @@ -const WCHAR szFindName[] = {'t','e', 's', 't', '0', '1', '.', 't', 'x', 't', '\0'}; -const WCHAR szFindName_02[] = {'t','e', 's', 't', '0', '2', '.', 't', 'x', 't', '\0'}; -const WCHAR szFindName_03[] = {'t','e', 's', 't', '0', '3', '.', 't', 'x', 't', '\0'}; -const WCHAR szFindNameWldCard_01[] = {'t','e', 's', 't', '0', '?', '.', 't', 'x', 't', '\0'}; -const WCHAR szFindNameWldCard_02[] = {'*', '.', 't', 'x', 't', '\0'}; -const WCHAR szDirName[] = {'t','e', 's', 't', '_', 'd', 'i', 'r', '\0'}; -const WCHAR szDirName_02[] = {'t','e', 's', 't', '_', 'd', 'i', 'r', '0', '2', '\0'}; -const WCHAR szDirNameWldCard[] = {'t','e', 's', 't', '_', '*', '\0'}; +const WCHAR szFindName_FindClose_test1[] = {'t','e', 's', 't', '0', '1', '.', 't', 'x', 't', '\0'}; +const WCHAR szFindName_02_FindClose_test1[] = {'t','e', 's', 't', '0', '2', '.', 't', 'x', 't', '\0'}; +const WCHAR szFindName_03_FindClose_test1[] = {'t','e', 's', 't', '0', '3', '.', 't', 'x', 't', '\0'}; +const WCHAR szFindNameWldCard_01_FindClose_test1[] = {'t','e', 's', 't', '0', '?', '.', 't', 'x', 't', '\0'}; +const WCHAR szFindNameWldCard_02_FindClose_test1[] = {'*', '.', 't', 'x', 't', '\0'}; +const WCHAR szDirName_FindClose_test1[] = {'t','e', 's', 't', '_', 'd', 'i', 'r', '\0'}; +const WCHAR szDirName_02_FindClose_test1[] = {'t','e', 's', 't', '_', 'd', 'i', 'r', '0', '2', '\0'}; +const WCHAR szDirNameWldCard_FindClose_test1[] = {'t','e', 's', 't', '_', '*', '\0'}; -BOOL createTestFile(const WCHAR* szName) +BOOL createTestFile_FindClose_test1(const WCHAR* szName) { FILE *pFile = NULL; char* pTemp = NULL; @@ -51,16 +51,16 @@ BOOL createTestFile(const WCHAR* szName) void removeAll() { - RemoveDirectoryW(szDirName); - RemoveDirectoryW(szDirName_02); + RemoveDirectoryW(szDirName_FindClose_test1); + RemoveDirectoryW(szDirName_02_FindClose_test1); - DeleteFileW(szFindName); - DeleteFileW(szFindName_02); - DeleteFileW(szFindName_03); + DeleteFileW(szFindName_FindClose_test1); + DeleteFileW(szFindName_02_FindClose_test1); + DeleteFileW(szFindName_03_FindClose_test1); } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindClose_test1_paltest_findclose_test1, "file_io/FindClose/test1/paltest_findclose_test1") { WIN32_FIND_DATAW findFileData; WIN32_FIND_DATAW findFileData_02; @@ -84,19 +84,19 @@ int __cdecl main(int argc, char *argv[]) } /* find a file that exists */ - if(createTestFile(szFindName) == FALSE) + if(createTestFile_FindClose_test1(szFindName_FindClose_test1) == FALSE) { removeAll(); PAL_TerminateEx(FAIL); return FAIL; } - if(createTestFile(szFindName_02) == FALSE) + if(createTestFile_FindClose_test1(szFindName_02_FindClose_test1) == FALSE) { removeAll(); PAL_TerminateEx(FAIL); return FAIL; } - if(createTestFile(szFindName_03) == FALSE) + if(createTestFile_FindClose_test1(szFindName_03_FindClose_test1) == FALSE) { removeAll(); PAL_TerminateEx(FAIL); @@ -104,10 +104,10 @@ int __cdecl main(int argc, char *argv[]) } // close a FindFirstFileW handle - hFind = FindFirstFileW(szFindName, &findFileData); + hFind = FindFirstFileW(szFindName_FindClose_test1, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - pTemp = convertC((WCHAR*)szFindName); + pTemp = convertC((WCHAR*)szFindName_FindClose_test1); Trace("FindClose: ERROR -> Unable to find \"%s\"\n", pTemp); free(pTemp); removeAll(); @@ -124,10 +124,10 @@ int __cdecl main(int argc, char *argv[]) " FindFirstFileW handle.\n"); } } - hFind = FindFirstFileW(szFindName, &findFileData); + hFind = FindFirstFileW(szFindName_FindClose_test1, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - pTemp = convertC((WCHAR*)szFindName); + pTemp = convertC((WCHAR*)szFindName_FindClose_test1); Trace("FindClose: ERROR -> Unable to find \"%s\"\n", pTemp); free(pTemp); removeAll(); @@ -155,10 +155,10 @@ int __cdecl main(int argc, char *argv[]) } /* find a directory that exists */ - bRc = CreateDirectoryW(szDirName, NULL); + bRc = CreateDirectoryW(szDirName_FindClose_test1, NULL); if (bRc == FALSE) { - pTemp = convertC((WCHAR*)szDirName); + pTemp = convertC((WCHAR*)szDirName_FindClose_test1); Trace("FindClose: ERROR -> Failed to create the directory \"%s\"\n", pTemp); free(pTemp); @@ -167,10 +167,10 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - bRc = CreateDirectoryW(szDirName_02, NULL); + bRc = CreateDirectoryW(szDirName_02_FindClose_test1, NULL); if (bRc == FALSE) { - pTemp = convertC((WCHAR*)szDirName_02); + pTemp = convertC((WCHAR*)szDirName_02_FindClose_test1); Trace("FindClose: ERROR -> Failed to create the directory \"%s\"\n", pTemp); free(pTemp); @@ -179,10 +179,10 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - hFind = FindFirstFileW(szDirName, &findFileData); + hFind = FindFirstFileW(szDirName_FindClose_test1, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - pTemp = convertC((WCHAR*)szDirName); + pTemp = convertC((WCHAR*)szDirName_FindClose_test1); Trace("FindClose: ERROR. FindFirstFileW was unable to find \"%s\"\n", pTemp); free(pTemp); @@ -202,10 +202,10 @@ int __cdecl main(int argc, char *argv[]) } /* find a file using wild cards */ - hFind = FindFirstFileW(szFindNameWldCard_01, &findFileData); + hFind = FindFirstFileW(szFindNameWldCard_01_FindClose_test1, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - pTemp = convertC((WCHAR*)szFindNameWldCard_01); + pTemp = convertC((WCHAR*)szFindNameWldCard_01_FindClose_test1); Trace("FindClose: ERROR -> FindFirstFileW was unable to find \"%s\"\n", pTemp); free(pTemp); @@ -234,10 +234,10 @@ int __cdecl main(int argc, char *argv[]) } /* find a directory using wild cards */ - hFind = FindFirstFileW(szDirNameWldCard, &findFileData); + hFind = FindFirstFileW(szDirNameWldCard_FindClose_test1, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - pTemp = convertC((WCHAR*)szDirNameWldCard); + pTemp = convertC((WCHAR*)szDirNameWldCard_FindClose_test1); Trace("FindClose: ERROR -> Unable to find \"%s\"\n", pTemp); free(pTemp); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/testinfo.dat deleted file mode 100644 index a330c61b858..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindClose/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindClose -Name = Test for FindClose (test 1) -Type = DEFAULT -EXE1 = findclose -Description -= Test the FindClose on handles opened using the Find functions - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt deleted file mode 100644 index c73e27ff0b7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FindFirstFileA.cpp -) - -add_executable(paltest_findfirstfilea_test1 - ${SOURCES} -) - -add_dependencies(paltest_findfirstfilea_test1 coreclrpal) - -target_link_libraries(paltest_findfirstfilea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp index da9934e1854..9a4d906162d 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp @@ -14,18 +14,18 @@ #include <palsuite.h> -const char* szNoFileName = "333asdf.x77t"; -const char* szFindName = "test01.txt"; -const char* szFindNameWldCard_01 = "test0?.txt"; -const char* szFindNameWldCard_02 = "*.txt"; -const char* szDirName = "test_dir"; -const char* szDirNameSlash = "test_dir\\"; -const char* szDirNameWldCard_01 = "?est_dir"; -const char* szDirNameWldCard_02 = "test_*"; +#define szNoFileName "333asdf.x77t" +#define szFindName "test01.txt" +#define szFindNameWldCard_01 "test0?.txt" +#define szFindNameWldCard_02 "*.txt" +#define szDirName "test_dir" +#define szDirNameSlash "test_dir\\" +#define szDirNameWldCard_01 "?est_dir" +#define szDirNameWldCard_02 "test_*" /* Longer than MAX_LONGPATH characters */ char szLongFindName[MAX_LONGPATH+1]; -BOOL CleanUp() +BOOL CleanUp_FindFirstFileA_test1() { DWORD dwAtt; BOOL result = TRUE; @@ -60,7 +60,7 @@ BOOL CleanUp() return result; } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindFirstFileA_test1_paltest_findfirstfilea_test1, "file_io/FindFirstFileA/test1/paltest_findfirstfilea_test1") { WIN32_FIND_DATA findFileData; HANDLE hFind = NULL; @@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[]) } - if(!CleanUp()) + if(!CleanUp_FindFirstFileA_test1()) { Fail("FindFirstFileW: ERROR : Initial Clean Up failed\n"); } @@ -196,7 +196,7 @@ int __cdecl main(int argc, char *argv[]) Fail ("FindFirstFileA: ERROR -> Unable to find \"%s\"\n", szDirNameWldCard_02); } - if(!CleanUp()) + if(!CleanUp_FindFirstFileA_test1()) { Fail("FindFirstFileW: ERROR : Final Clean Up failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/testinfo.dat deleted file mode 100644 index 7a2e05906dc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindFirstFileA -Name = Test for FindFirstFileA (test 1) -Type = DEFAULT -EXE1 = findfirstfilea -Description -= Create a number of files and try to find them - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt deleted file mode 100644 index e2380b194be..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FindFirstFileW.cpp -) - -add_executable(paltest_findfirstfilew_test1 - ${SOURCES} -) - -add_dependencies(paltest_findfirstfilew_test1 coreclrpal) - -target_link_libraries(paltest_findfirstfilew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp index 5b0d89db59b..362cea7f631 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp @@ -14,17 +14,17 @@ #include <palsuite.h> -const char* szNoFileName = "333asdf.x77t"; -const char* szFindName = "test01.txt"; -const char* szFindNameWldCard_01 = "test0?.txt"; -const char* szFindNameWldCard_02 = "*.txt"; -const char* szDirName = "test_dir"; -const char* szDirNameSlash = "test_dir\\"; -const char* szDirNameWldCard_01 = "?est_dir"; -const char* szDirNameWldCard_02 = "test_*"; +#define szNoFileName "333asdf.x77t" +#define szFindName "test01.txt" +#define szFindNameWldCard_01 "test0?.txt" +#define szFindNameWldCard_02 "*.txt" +#define szDirName "test_dir" +#define szDirNameSlash "test_dir\\" +#define szDirNameWldCard_01 "?est_dir" +#define szDirNameWldCard_02 "test_*" -BOOL CleanUp() +BOOL CleanUp_FindFirstFileW_test1() { DWORD dwAtt; BOOL result = TRUE; @@ -59,7 +59,7 @@ BOOL CleanUp() return result; } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindFirstFileW_test1_paltest_findfirstfilew_test1, "file_io/FindFirstFileW/test1/paltest_findfirstfilew_test1") { WIN32_FIND_DATAW findFileData; HANDLE hFind = NULL; @@ -73,7 +73,7 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - if(!CleanUp()) + if(!CleanUp_FindFirstFileW_test1()) { Fail("FindFirstFileW: ERROR : Initial Clean Up failed\n"); } @@ -203,7 +203,7 @@ int __cdecl main(int argc, char *argv[]) szDirNameWldCard_02); } - if(!CleanUp()) + if(!CleanUp_FindFirstFileW_test1()) { Fail("FindFirstFileW: ERROR : Final Clean Up failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/testinfo.dat deleted file mode 100644 index 0a89d3659df..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindFirstFileW -Name = Test for FindFirstFileW (test 1) -Type = DEFAULT -EXE1 = findfirstfilew -Description -= Create a number of files and try to find them - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt deleted file mode 100644 index 98329356ece..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FindNextFileA.cpp -) - -add_executable(paltest_findnextfilea_test1 - ${SOURCES} -) - -add_dependencies(paltest_findnextfilea_test1 coreclrpal) - -target_link_libraries(paltest_findnextfilea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp index a9192b464c9..dd7981efaab 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp @@ -13,17 +13,17 @@ #include <palsuite.h> -const char* szFindName = "test01.txt"; -const char* szFindName_02 = "test02.txt"; -const char* szFindNameWldCard_01 = "test0?.txt"; -const char* szFindNameWldCard_02 = "*.txt"; -const char* szDirName = "test_dir"; -const char* szDirName_02 = "test_dir_02"; -const char* szDirNameWldCard = "test_*"; +#define szFindName "test01.txt" +#define szFindName_02 "test02.txt" +#define szFindNameWldCard_01 "test0?.txt" +#define szFindNameWldCard_02 "*.txt" +#define szDirName "test_dir" +#define szDirName_02 "test_dir_02" +#define szDirNameWldCard "test_*" -void removeAll() +void removeAll_FindNextFileA_test1() { WCHAR* wTempPtr = NULL; @@ -39,7 +39,7 @@ void removeAll() -BOOL createTestFile(const char* szName) +BOOL createTestFile_FindNextFileA_test1(const char* szName) { FILE *pFile = NULL; @@ -48,7 +48,7 @@ BOOL createTestFile(const char* szName) { Trace("FindNextFile: ERROR -> Unable to create file \"%s\".\n", szName); - removeAll(); + removeAll_FindNextFileA_test1(); return FALSE; } else @@ -61,7 +61,7 @@ BOOL createTestFile(const char* szName) -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindNextFileA_test1_paltest_findnextfilea_test1, "file_io/FindNextFileA/test1/paltest_findnextfilea_test1") { WIN32_FIND_DATA findFileData; WIN32_FIND_DATA findFileData_02; @@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[]) { return FAIL; } - removeAll(); + removeAll_FindNextFileA_test1(); // @@ -97,12 +97,12 @@ int __cdecl main(int argc, char *argv[]) // // find a file that exists // - if(createTestFile(szFindName) == FALSE) + if(createTestFile_FindNextFileA_test1(szFindName) == FALSE) { PAL_TerminateEx(FAIL); return FAIL; } - if(createTestFile(szFindName_02) == FALSE) + if(createTestFile_FindNextFileA_test1(szFindName_02) == FALSE) { PAL_TerminateEx(FAIL); return FAIL; @@ -111,7 +111,7 @@ int __cdecl main(int argc, char *argv[]) hFind = FindFirstFileA(szFindName, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Unable to find \"%s\"\n", szFindName); } else @@ -119,7 +119,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFile(hFind, &findFileData); if (bRc != FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Found a file that doesn't exist.\n"); } } @@ -133,7 +133,7 @@ int __cdecl main(int argc, char *argv[]) free (wTempPtr); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Failed to create the directory \"%s\"\n", szDirName); } @@ -142,7 +142,7 @@ int __cdecl main(int argc, char *argv[]) free (wTempPtr); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Failed to create the directory \"%s\"\n", szDirName_02); } @@ -150,7 +150,7 @@ int __cdecl main(int argc, char *argv[]) hFind = FindFirstFileA(szDirName, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR. FindFirstFileA was unable to find \"%s\"\n", szDirName); } @@ -159,7 +159,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFile(hFind, &findFileData); if (bRc != FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Found a directory that doesn't exist.\n"); } } @@ -171,7 +171,7 @@ int __cdecl main(int argc, char *argv[]) hFind = FindFirstFileA(szFindNameWldCard_01, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> FindFirstFileA was unable to find \"%s\"\n", szFindNameWldCard_01); } @@ -180,7 +180,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFile(hFind, &findFileData_02); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Unable to find another file.\n"); } else @@ -188,7 +188,7 @@ int __cdecl main(int argc, char *argv[]) // validate we found the correct file if (strcmp(findFileData_02.cFileName, findFileData.cFileName) == 0) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Found the same file \"%s\".\n", findFileData.cFileName); } @@ -202,7 +202,7 @@ int __cdecl main(int argc, char *argv[]) hFind = FindFirstFileA(szDirNameWldCard, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Unable to find \"%s\"\n", szDirNameWldCard); } @@ -211,7 +211,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFile(hFind, &findFileData_02); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Unable to find another directory.\n"); } else @@ -219,7 +219,7 @@ int __cdecl main(int argc, char *argv[]) // validate we found the correct directory if (strcmp(findFileData_02.cFileName, findFileData.cFileName) == 0) { - removeAll(); + removeAll_FindNextFileA_test1(); Fail("FindNextFile: ERROR -> Found the same directory \"%s\".\n", findFileData.cFileName); } @@ -230,7 +230,7 @@ int __cdecl main(int argc, char *argv[]) // attempt to write to the hFind handle (which should fail) // bRc = WriteFile(hFind, "this is a test", 10, &dwBytesWritten, NULL); - removeAll(); + removeAll_FindNextFileA_test1(); if (bRc == TRUE) { Fail("FindNextFile: ERROR -> Able to write to a FindNextFile handle.\n"); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/testinfo.dat deleted file mode 100644 index dc0ad63f1a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindNextFileA -Name = Test for FindNextFileA (test 1) -Type = DEFAULT -EXE1 = findnextfilea -Description -= Create test files and directories to verify FindNextFileA - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt deleted file mode 100644 index 5e013cacd68..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - findnextfilea.cpp -) - -add_executable(paltest_findnextfilea_test2 - ${SOURCES} -) - -add_dependencies(paltest_findnextfilea_test2 coreclrpal) - -target_link_libraries(paltest_findnextfilea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp index 091d0c37bd5..3ef068ac1af 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp @@ -88,7 +88,7 @@ static void DoTest(const char* szDir, } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindNextFileA_test2_paltest_findnextfilea_test2, "file_io/FindNextFileA/test2/paltest_findnextfilea_test2") { if (0 != PAL_Initialize(argc,argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/testinfo.dat deleted file mode 100644 index 23d17cb80c1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileA/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindNextFileA -Name = Test for FindNextFileA (test 2) -Type = DEFAULT -EXE1 = findnextfilea -Description -= Tests the PAL implementation of the FindNextFileA function. -= Tests '*' and '*.*' to ensure that '.' and '..' are -= returned in the expected order diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt deleted file mode 100644 index 1ba07bd294e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FindNextFileW.cpp -) - -add_executable(paltest_findnextfilew_test1 - ${SOURCES} -) - -add_dependencies(paltest_findnextfilew_test1 coreclrpal) - -target_link_libraries(paltest_findnextfilew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp index df271f8b849..bdcc73f605f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp @@ -13,17 +13,15 @@ #include <palsuite.h> -const char* szFindName = "test01.txt"; -const char* szFindName_02 = "test02.txt"; -const char* szFindNameWldCard_01 = "test0?.txt"; -const char* szFindNameWldCard_02 = "*.txt"; -const char* szDirName = "test_dir"; -const char* szDirName_02 = "test_dir_02"; -const char* szDirNameWldCard = "test_*"; - - - -void removeAll() +#define szFindName "test01.txt" +#define szFindName_02 "test02.txt" +#define szFindNameWldCard_01 "test0?.txt" +#define szFindNameWldCard_02 "*.txt" +#define szDirName "test_dir" +#define szDirName_02 "test_dir_02" +#define szDirNameWldCard "test_*" + +void removeAll_FindNextFileW_test1() { WCHAR* wTempPtr = NULL; @@ -46,7 +44,7 @@ void removeAll() -BOOL createTestFile(const char* szName) +BOOL createTestFile_FindNextFileW_test1(const char* szName) { FILE *pFile = NULL; @@ -54,7 +52,7 @@ BOOL createTestFile(const char* szName) if (pFile == NULL) { Trace("FindNextFileW: ERROR -> Unable to create file \"%s\".\n", szName); - removeAll(); + removeAll_FindNextFileW_test1(); return FALSE; } else @@ -68,7 +66,7 @@ BOOL createTestFile(const char* szName) -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindNextFileW_test1_paltest_findnextfilew_test1, "file_io/FindNextFileW/test1/paltest_findnextfilew_test1") { WIN32_FIND_DATAW findFileData; WIN32_FIND_DATAW findFileData_02; @@ -82,18 +80,18 @@ int __cdecl main(int argc, char *argv[]) { return FAIL; } - removeAll(); + removeAll_FindNextFileW_test1(); // // find a file that exists // - if(createTestFile(szFindName) == FALSE) + if(createTestFile_FindNextFileW_test1(szFindName) == FALSE) { PAL_TerminateEx(FAIL); return FAIL; } - if(createTestFile(szFindName_02) == FALSE) + if(createTestFile_FindNextFileW_test1(szFindName_02) == FALSE) { PAL_TerminateEx(FAIL); return FAIL; @@ -104,7 +102,7 @@ int __cdecl main(int argc, char *argv[]) free(wTempPtr); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Unable to find \"%s\"\n", szFindName); } else @@ -112,7 +110,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFileW(hFind, &findFileData); if (bRc != FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Found a file that doesn't exist.\n"); } } @@ -126,7 +124,7 @@ int __cdecl main(int argc, char *argv[]) free (wTempPtr); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Failed to create the directory \"%s\"\n", szDirName); } @@ -135,7 +133,7 @@ int __cdecl main(int argc, char *argv[]) free (wTempPtr); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Failed to create the directory " "\"%s\"\n", szDirName_02); @@ -146,7 +144,7 @@ int __cdecl main(int argc, char *argv[]) free (wTempPtr); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR. FindFirstFileW was unable " "to find \"%s\"\n", szDirName); @@ -156,7 +154,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFileW(hFind, &findFileData); if (bRc != FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Found a directory that " "doesn't exist.\n"); } @@ -171,7 +169,7 @@ int __cdecl main(int argc, char *argv[]) free(wTempPtr); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> FindFirstFileW was unable to " "find \"%s\"\n", szFindNameWldCard_01); @@ -181,7 +179,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFileW(hFind, &findFileData_02); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Unable to find another file.\n"); } else @@ -189,7 +187,7 @@ int __cdecl main(int argc, char *argv[]) // validate we found the correct file if (wcscmp(findFileData_02.cFileName, findFileData.cFileName) == 0) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Found the same file \"%S\".\n", findFileData.cFileName); } @@ -205,7 +203,7 @@ int __cdecl main(int argc, char *argv[]) free(wTempPtr); if (hFind == INVALID_HANDLE_VALUE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Unable to find \"%s\"\n", szDirNameWldCard); } @@ -214,7 +212,7 @@ int __cdecl main(int argc, char *argv[]) bRc = FindNextFileW(hFind, &findFileData_02); if (bRc == FALSE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Unable to find another directory.\n"); } else @@ -222,7 +220,7 @@ int __cdecl main(int argc, char *argv[]) // validate we found the correct directory if (wcscmp(findFileData_02.cFileName, findFileData.cFileName) == 0) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Found the same directory " "\"%S\".\n", findFileData.cFileName); @@ -236,12 +234,12 @@ int __cdecl main(int argc, char *argv[]) bRc = WriteFile(hFind, "this is a test", 10, &dwBytesWritten, NULL); if (bRc == TRUE) { - removeAll(); + removeAll_FindNextFileW_test1(); Fail("FindNextFileW: ERROR -> Able to write to a FindNextFileW " "handle.\n"); } - removeAll(); + removeAll_FindNextFileW_test1(); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/testinfo.dat deleted file mode 100644 index 97ac53884a2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindNextFileW -Name = Test for FindNextFileW (test 1) -Type = DEFAULT -EXE1 = findnextfilew -Description -= Create test files and directories to verify FindNextFileW - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt deleted file mode 100644 index 5944a0943f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - findnextfilew.cpp -) - -add_executable(paltest_findnextfilew_test2 - ${SOURCES} -) - -add_dependencies(paltest_findnextfilew_test2 coreclrpal) - -target_link_libraries(paltest_findnextfilew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp index b0e5f4857b8..58d01da7e8f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp @@ -88,7 +88,7 @@ static void DoTest(const WCHAR* szwDir, } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_FindNextFileW_test2_paltest_findnextfilew_test2, "file_io/FindNextFileW/test2/paltest_findnextfilew_test2") { if (0 != PAL_Initialize(argc,argv)) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/testinfo.dat deleted file mode 100644 index 664538d76a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FindNextFileW/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FindNextFileW -Name = Test for FindNextFileW (test 2) -Type = DEFAULT -EXE1 = findnextfilew -Description -= Tests the PAL implementation of the FindNextFileW function. -= Tests '*' and '*.*' to ensure that '.' and '..' are -= returned in the expected order diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt deleted file mode 100644 index bb8a0bbe584..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - FlushFileBuffers.cpp -) - -add_executable(paltest_flushfilebuffers_test1 - ${SOURCES} -) - -add_dependencies(paltest_flushfilebuffers_test1 coreclrpal) - -target_link_libraries(paltest_flushfilebuffers_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp index 8c7b7545fad..f1de32d7fc8 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(file_io_FlushFileBuffers_test1_paltest_flushfilebuffers_test1, "file_io/FlushFileBuffers/test1/paltest_flushfilebuffers_test1") { int TheReturn; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/testinfo.dat deleted file mode 100644 index 54b3c24e305..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = FlushFileBuffers -Name = Positive Test for FlushFileBuffers -TYPE = DEFAULT -EXE1 = flushfilebuffers -Description -= Test the FlushFileBuffers -= Test the return values -- ensure that the correct values are -= returned for success and failure. -= This test does not prove that flush worked, -= there is no way of stopping the OS from flushing -= the file by itself. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt deleted file mode 100644 index 541e5fac565..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetConsoleOutputCP.cpp -) - -add_executable(paltest_getconsoleoutputcp_test1 - ${SOURCES} -) - -add_dependencies(paltest_getconsoleoutputcp_test1 coreclrpal) - -target_link_libraries(paltest_getconsoleoutputcp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp index 137839387cd..7c391e3f176 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetConsoleOutputCP_test1_paltest_getconsoleoutputcp_test1, "file_io/GetConsoleOutputCP/test1/paltest_getconsoleoutputcp_test1") { UINT uiCP = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/testinfo.dat deleted file mode 100644 index 85fb02067be..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetConsoleOutputCP -Name = Positive Test for GetConsoleOutputCP (test 1) -Type = DEFAULT -EXE1 = getconsoleoutputcp -Description -= Test GetConsoleOutputCP. Apparently there are only two possible -= return values: CP_ACP or 1252 diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt deleted file mode 100644 index b64c050432c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetCurrentDirectoryA.cpp -) - -add_executable(paltest_getcurrentdirectorya_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentdirectorya_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentdirectorya_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp index 2e28e530bfd..e5411c0aad8 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp @@ -12,11 +12,12 @@ #include <palsuite.h> -const char* szFileName = "blah"; -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetCurrentDirectoryA_test1_paltest_getcurrentdirectorya_test1, "file_io/GetCurrentDirectoryA/test1/paltest_getcurrentdirectorya_test1") { + const char* szFileName = "blah"; + DWORD dwRc = 0; DWORD dwRc2 = 0; char szReturnedPath[_MAX_PATH+1]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/testinfo.dat deleted file mode 100644 index d5c59d99707..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetCurrentDirectoryA -Name = Test for GetCurrentDirectoryA (test 1) -Type = DEFAULT -EXE1 = getcurrentdirectorya -Description -= Calculate the current directory name and compare to that -= returned by GetCurrentDirectoryA - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt deleted file mode 100644 index 92f6e4edc57..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetCurrentDirectoryW.cpp -) - -add_executable(paltest_getcurrentdirectoryw_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentdirectoryw_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentdirectoryw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp index a183663387c..f25ff41d6cc 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetCurrentDirectoryW_test1_paltest_getcurrentdirectoryw_test1, "file_io/GetCurrentDirectoryW/test1/paltest_getcurrentdirectoryw_test1") { DWORD dwRc = 0; DWORD dwRc2 = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/testinfo.dat deleted file mode 100644 index d3ddb7ea4f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetCurrentDirectoryW -Name = Test for GetCurrentDirectoryW (test 1) -Type = DEFAULT -EXE1 = getcurrentdirectoryw -Description -= Compute the current directory and compare with the results -= from GetCurrentDirectoryW - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_ro_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_ro_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/.hidden_ro_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt deleted file mode 100644 index 347816e4eb9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -set(SOURCES - GetFileAttributesA.cpp -) - -add_executable(paltest_getfileattributesa_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfileattributesa_test1 coreclrpal) - -target_link_libraries(paltest_getfileattributesa_test1 - ${COMMON_TEST_LIBRARIES} -) -add_subdirectory(.hidden_directory) -add_subdirectory(.hidden_ro_directory) -add_subdirectory(normal_test_directory) -add_subdirectory(no_directory) -add_subdirectory(ro_test_directory) -add_subdirectory(rw_directory) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp index bf87e43c050..309be929e11 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp @@ -38,41 +38,41 @@ typedef struct int isFile; /* is file (1) or dir (0) */ }TestCaseDir; -DWORD desiredAccessFile = GENERIC_READ | GENERIC_WRITE; -DWORD shareModeFile = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; -LPSECURITY_ATTRIBUTES lpAttrFile = NULL; -DWORD dwCreationDispFile = CREATE_NEW; -DWORD dwFlagsAttribFile = FILE_ATTRIBUTE_NORMAL; -HANDLE hTemplateFile = NULL; +DWORD desiredAccessFile_GetFileAttributesA_test1 = GENERIC_READ | GENERIC_WRITE; +DWORD shareModeFile_GetFileAttributesA_test1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; +LPSECURITY_ATTRIBUTES lpAttrFile_GetFileAttributesA_test1 = NULL; +DWORD dwCreationDispFile_GetFileAttributesA_test1 = CREATE_NEW; +DWORD dwFlagsAttribFile_GetFileAttributesA_test1 = FILE_ATTRIBUTE_NORMAL; +HANDLE hTemplateFile_GetFileAttributesA_test1 = NULL; -int numFileTests = 6; -TestCaseFile gfaTestsFile[6]; /* GetFileAttributes tests list */ +int numFileTests_A = 6; +TestCaseFile gfaTestsFile_A[6]; /* GetFileAttributes tests list */ -int numDirTests = 6; -TestCaseDir gfaTestsDir[6]; /* GetFileAttributes tests list */ +int numDirTests_A = 6; +TestCaseDir gfaTestsDir_A[6]; /* GetFileAttributes tests list */ -BOOL CleanUpFiles() +BOOL CleanUpFiles_GetFileAttributesA_test1() { DWORD dwAtt; int i; BOOL result = TRUE; - for (i = 0; i < numFileTests -1 ; i++ ) + for (i = 0; i < numFileTests_A -1 ; i++ ) { - dwAtt = GetFileAttributesA(gfaTestsFile[i].name); + dwAtt = GetFileAttributesA(gfaTestsFile_A[i].name); if( dwAtt != INVALID_FILE_ATTRIBUTES ) { //Trace("Files iteration %d\n", i); - if(!SetFileAttributesA (gfaTestsFile[i].name, FILE_ATTRIBUTE_NORMAL)) + if(!SetFileAttributesA (gfaTestsFile_A[i].name, FILE_ATTRIBUTE_NORMAL)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, FILE_ATTRIBUTE_NORMAL); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile_A[i].name, FILE_ATTRIBUTE_NORMAL); } - if(!DeleteFileA (gfaTestsFile[i].name)) + if(!DeleteFileA (gfaTestsFile_A[i].name)) { result = FALSE; - Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, dwAtt); + Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsFile_A[i].name, dwAtt); } } @@ -80,58 +80,58 @@ BOOL CleanUpFiles() // Trace("Value of result is %d\n", result); return result; } -BOOL SetUpFiles() +BOOL SetUpFiles_GetFileAttributesA_test1() { int i = 0; BOOL result = TRUE; - for (i = 0; i < numFileTests -1; i++ ) + for (i = 0; i < numFileTests_A -1; i++ ) { - gfaTestsFile[i].hFile = CreateFile(gfaTestsFile[i].name, - desiredAccessFile, - shareModeFile, - lpAttrFile, - dwCreationDispFile, - dwFlagsAttribFile, - hTemplateFile); - - if( gfaTestsFile[i].hFile == NULL ) + gfaTestsFile_A[i].hFile = CreateFile(gfaTestsFile_A[i].name, + desiredAccessFile_GetFileAttributesA_test1, + shareModeFile_GetFileAttributesA_test1, + lpAttrFile_GetFileAttributesA_test1, + dwCreationDispFile_GetFileAttributesA_test1, + dwFlagsAttribFile_GetFileAttributesA_test1, + hTemplateFile_GetFileAttributesA_test1); + + if( gfaTestsFile_A[i].hFile == NULL ) { Fail("Error while creating files for iteration %d\n", i); } - if(!SetFileAttributesA (gfaTestsFile[i].name, gfaTestsFile[i].expectedAttribs)) + if(!SetFileAttributesA (gfaTestsFile_A[i].name, gfaTestsFile_A[i].expectedAttribs)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, gfaTestsFile[i].expectedAttribs); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile_A[i].name, gfaTestsFile_A[i].expectedAttribs); } } return result; } -BOOL CleanUpDirs() +BOOL CleanUpDirs_GetFileAttributesA_test1() { DWORD dwAtt; int i; BOOL result = TRUE; - for (i = 0; i < numDirTests -1 ; i++ ) + for (i = 0; i < numDirTests_A -1 ; i++ ) { - dwAtt = GetFileAttributesA(gfaTestsDir[i].name); + dwAtt = GetFileAttributesA(gfaTestsDir_A[i].name); if( dwAtt != INVALID_FILE_ATTRIBUTES ) { - if(!SetFileAttributesA (gfaTestsDir[i].name, FILE_ATTRIBUTE_DIRECTORY)) + if(!SetFileAttributesA (gfaTestsDir_A[i].name, FILE_ATTRIBUTE_DIRECTORY)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, (FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY)); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir_A[i].name, (FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY)); } - LPWSTR nameW = convert(gfaTestsDir[i].name); + LPWSTR nameW = convert(gfaTestsDir_A[i].name); if(!RemoveDirectoryW (nameW)) { result = FALSE; - Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, dwAtt); + Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsDir_A[i].name, dwAtt); } free(nameW); @@ -141,14 +141,14 @@ BOOL CleanUpDirs() return result; } -BOOL SetUpDirs() +BOOL SetUpDirs_GetFileAttributesA_test1() { int i = 0; BOOL result = TRUE; DWORD ret = 0; - for (i = 0; i < numDirTests - 1 ; i++ ) + for (i = 0; i < numDirTests_A - 1 ; i++ ) { - result = CreateDirectoryA(gfaTestsDir[i].name, + result = CreateDirectoryA(gfaTestsDir_A[i].name, NULL); if(!result ) @@ -157,25 +157,25 @@ BOOL SetUpDirs() Fail("Error while creating directory for iteration %d\n", i); } - if(!SetFileAttributesA (gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs)) + if(!SetFileAttributesA (gfaTestsDir_A[i].name, gfaTestsDir_A[i].expectedAttribs)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir_A[i].name, gfaTestsDir_A[i].expectedAttribs); } - ret = GetFileAttributesA (gfaTestsDir[i].name); - if(ret != gfaTestsDir[i].expectedAttribs) + ret = GetFileAttributesA (gfaTestsDir_A[i].name); + if(ret != gfaTestsDir_A[i].expectedAttribs) { result = FALSE; - Trace("ERROR: Error setting attributes [%s][%d]\n", gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs); + Trace("ERROR: Error setting attributes [%s][%d]\n", gfaTestsDir_A[i].name, gfaTestsDir_A[i].expectedAttribs); } - //Trace("Setup Dir setting attr [%d], returned [%d]\n", gfaTestsDir[i].expectedAttribs, ret); + //Trace("Setup Dir setting attr [%d], returned [%d]\n", gfaTestsDir_A[i].expectedAttribs, ret); } //Trace("Setup dirs returning %d\n", result); return result; } -int __cdecl main(int argc, char **argv) +PALTEST(file_io_GetFileAttributesA_test1_paltest_getfileattributesa_test1, "file_io/GetFileAttributesA/test1/paltest_getfileattributesa_test1") { int i; BOOL bFailed = FALSE; @@ -196,61 +196,61 @@ int __cdecl main(int argc, char **argv) char * NotReallyAFileName = "not_really_a_file"; /* Tests on directory */ - gfaTestsDir[0].name = NormalDirectoryName; - gfaTestsDir[0].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; - gfaTestsDir[0].isFile = TYPE_DIR; + gfaTestsDir_A[0].name = NormalDirectoryName; + gfaTestsDir_A[0].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; + gfaTestsDir_A[0].isFile = TYPE_DIR; - gfaTestsDir[1].name = ReadOnlyDirectoryName; - gfaTestsDir[1].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | + gfaTestsDir_A[1].name = ReadOnlyDirectoryName; + gfaTestsDir_A[1].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY; - gfaTestsDir[1].isFile = TYPE_DIR; + gfaTestsDir_A[1].isFile = TYPE_DIR; - gfaTestsDir[2].name = ReadWriteDirectoryName; - gfaTestsDir[2].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; - gfaTestsDir[2].isFile = TYPE_DIR; + gfaTestsDir_A[2].name = ReadWriteDirectoryName; + gfaTestsDir_A[2].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; + gfaTestsDir_A[2].isFile = TYPE_DIR; - gfaTestsDir[3].name = HiddenDirectoryName; - gfaTestsDir[3].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; //| + gfaTestsDir_A[3].name = HiddenDirectoryName; + gfaTestsDir_A[3].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsDir[3].isFile = TYPE_DIR; + gfaTestsDir_A[3].isFile = TYPE_DIR; - gfaTestsDir[4].name = HiddenReadOnlyDirectoryName; - gfaTestsDir[4].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | + gfaTestsDir_A[4].name = HiddenReadOnlyDirectoryName; + gfaTestsDir_A[4].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsDir[4].isFile = TYPE_DIR; + gfaTestsDir_A[4].isFile = TYPE_DIR; - gfaTestsDir[5].name = NoDirectoryName; - gfaTestsDir[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; - gfaTestsDir[5].isFile = TYPE_DIR; + gfaTestsDir_A[5].name = NoDirectoryName; + gfaTestsDir_A[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; + gfaTestsDir_A[5].isFile = TYPE_DIR; /* Tests on file */ - gfaTestsFile[0].name = NormalFileName; - gfaTestsFile[0].expectedAttribs = FILE_ATTRIBUTE_NORMAL; - gfaTestsFile[0].isFile = TYPE_FILE; + gfaTestsFile_A[0].name = NormalFileName; + gfaTestsFile_A[0].expectedAttribs = FILE_ATTRIBUTE_NORMAL; + gfaTestsFile_A[0].isFile = TYPE_FILE; - gfaTestsFile[1].name = ReadOnlyFileName; - gfaTestsFile[1].expectedAttribs = FILE_ATTRIBUTE_READONLY; - gfaTestsFile[1].isFile = TYPE_FILE; + gfaTestsFile_A[1].name = ReadOnlyFileName; + gfaTestsFile_A[1].expectedAttribs = FILE_ATTRIBUTE_READONLY; + gfaTestsFile_A[1].isFile = TYPE_FILE; - gfaTestsFile[2].name = ReadWriteFileName; - gfaTestsFile[2].expectedAttribs = FILE_ATTRIBUTE_NORMAL; - gfaTestsFile[2].isFile = TYPE_FILE; + gfaTestsFile_A[2].name = ReadWriteFileName; + gfaTestsFile_A[2].expectedAttribs = FILE_ATTRIBUTE_NORMAL; + gfaTestsFile_A[2].isFile = TYPE_FILE; - gfaTestsFile[3].name = HiddenFileName; - gfaTestsFile[3].expectedAttribs = FILE_ATTRIBUTE_NORMAL; //FILE_ATTRIBUTE_HIDDEN; - gfaTestsFile[3].isFile = TYPE_FILE; + gfaTestsFile_A[3].name = HiddenFileName; + gfaTestsFile_A[3].expectedAttribs = FILE_ATTRIBUTE_NORMAL; //FILE_ATTRIBUTE_HIDDEN; + gfaTestsFile_A[3].isFile = TYPE_FILE; - gfaTestsFile[4].name = HiddenReadOnlyFileName; - gfaTestsFile[4].expectedAttribs = FILE_ATTRIBUTE_READONLY; //| + gfaTestsFile_A[4].name = HiddenReadOnlyFileName; + gfaTestsFile_A[4].expectedAttribs = FILE_ATTRIBUTE_READONLY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsFile[4].isFile = TYPE_FILE; + gfaTestsFile_A[4].isFile = TYPE_FILE; - gfaTestsFile[5].name = NotReallyAFileName; - gfaTestsFile[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; - gfaTestsFile[5].isFile = TYPE_FILE; + gfaTestsFile_A[5].name = NotReallyAFileName; + gfaTestsFile_A[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; + gfaTestsFile_A[5].isFile = TYPE_FILE; /* Initialize PAL environment */ if (0 != PAL_Initialize(argc,argv)) @@ -258,22 +258,22 @@ int __cdecl main(int argc, char **argv) return FAIL; } - if(!CleanUpFiles()) + if(!CleanUpFiles_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: Pre-Clean Up Files Failed\n"); } - if(0 == SetUpFiles()) + if(0 == SetUpFiles_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: SetUp Files Failed\n"); } - if(!CleanUpDirs()) + if(!CleanUpDirs_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: Pre-Clean Up Directories Failed\n"); } - if(!SetUpDirs()) + if(!SetUpDirs_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: SetUp Directories Failed\n"); } @@ -283,49 +283,49 @@ int __cdecl main(int argc, char **argv) * call GetFileAttributesA on the name and * make sure the return value is the one expected */ - for( i = 0; i < numFileTests; i++ ) + for( i = 0; i < numFileTests_A; i++ ) { - result = GetFileAttributesA(gfaTestsFile[i].name); + result = GetFileAttributesA(gfaTestsFile_A[i].name); - if( result != gfaTestsFile[i].expectedAttribs ) + if( result != gfaTestsFile_A[i].expectedAttribs ) { bFailed = TRUE; Trace("ERROR: GetFileAttributesA Test#%u on %s " "returned %u instead of %u. \n", i, - gfaTestsFile[i].name, + gfaTestsFile_A[i].name, result, - gfaTestsFile[i].expectedAttribs); + gfaTestsFile_A[i].expectedAttribs); } } - for( i = 0; i < numDirTests; i++ ) + for( i = 0; i < numDirTests_A; i++ ) { - result = GetFileAttributesA(gfaTestsDir[i].name); + result = GetFileAttributesA(gfaTestsDir_A[i].name); - if( result != gfaTestsDir[i].expectedAttribs ) + if( result != gfaTestsDir_A[i].expectedAttribs ) { bFailed = TRUE; Trace("ERROR: GetFileAttributesA on Directories Test#%u on %s " "returned %u instead of %u. \n", i, - gfaTestsDir[i].name, + gfaTestsDir_A[i].name, result, - gfaTestsDir[i].expectedAttribs); + gfaTestsDir_A[i].expectedAttribs); } } - if(!CleanUpFiles()) + if(!CleanUpFiles_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: Post-Clean Up Files Failed\n"); } - if(!CleanUpDirs()) + if(!CleanUpDirs_GetFileAttributesA_test1()) { Fail("GetFileAttributesA: Post-Clean Up Directories Failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/no_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/no_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/no_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/normal_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/normal_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/normal_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/ro_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/ro_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/ro_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/rw_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/rw_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/rw_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/testinfo.dat deleted file mode 100644 index eb49f3c4952..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/testinfo.dat +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = file_io - -Function = GetFileAttributesA - -Name = Positive Test for GetFileAttributesA - -TYPE = DEFAULT - -EXE1 = getfileattributesa - -Description - -= Test the GetFileAttributesA function - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/.hidden_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/.hidden_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/.hidden_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt deleted file mode 100644 index 8929fa8876f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_getfileattributesexw_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfileattributesexw_test1 coreclrpal) - -target_link_libraries(paltest_getfileattributesexw_test1 - ${COMMON_TEST_LIBRARIES} -) -add_subdirectory(.hidden_directory) -add_subdirectory(normal_test_directory) -add_subdirectory(ro_test_directory) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/normal_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/normal_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/normal_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/ro_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/ro_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/ro_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp index 037d276af80..8cc392fc891 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp @@ -93,7 +93,7 @@ void VerifyInfo(WIN32_FILE_ATTRIBUTE_DATA InfoStruct, results are correct. */ -void RunTest(char* Name, DWORD Attribs, ItemType TheType ) +void RunTest_GetFileAttributesExW_test1(char* Name, DWORD Attribs, ItemType TheType ) { WCHAR* TheName; WIN32_FILE_ATTRIBUTE_DATA InfoStruct; @@ -115,7 +115,7 @@ void RunTest(char* Name, DWORD Attribs, ItemType TheType ) } -int __cdecl main(int argc, char **argv) +PALTEST(file_io_GetFileAttributesExW_test1_paltest_getfileattributesexw_test1, "file_io/GetFileAttributesExW/test1/paltest_getfileattributesexw_test1") { DWORD TheResult; WCHAR* FileName; @@ -127,29 +127,29 @@ int __cdecl main(int argc, char **argv) } /* Test a Directroy */ - RunTest("normal_test_directory", FILE_ATTRIBUTE_DIRECTORY, IS_DIR); + RunTest_GetFileAttributesExW_test1("normal_test_directory", FILE_ATTRIBUTE_DIRECTORY, IS_DIR); /* Test a Normal File */ - RunTest("normal_test_file", FILE_ATTRIBUTE_NORMAL, IS_FILE); + RunTest_GetFileAttributesExW_test1("normal_test_file", FILE_ATTRIBUTE_NORMAL, IS_FILE); /* Test a Read-Only Directroy */ - RunTest("ro_test_directory", + RunTest_GetFileAttributesExW_test1("ro_test_directory", FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_DIRECTORY, IS_DIR); /* Test a Read-Only File */ - RunTest("ro_test_file", FILE_ATTRIBUTE_READONLY, IS_FILE); + RunTest_GetFileAttributesExW_test1("ro_test_file", FILE_ATTRIBUTE_READONLY, IS_FILE); /* Test a Hidden File */ - RunTest(".hidden_file", FILE_ATTRIBUTE_HIDDEN, IS_FILE); + RunTest_GetFileAttributesExW_test1(".hidden_file", FILE_ATTRIBUTE_HIDDEN, IS_FILE); /* Test a Hidden Directroy */ - RunTest(".hidden_directory", + RunTest_GetFileAttributesExW_test1(".hidden_directory", FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_DIRECTORY, IS_DIR); /* Test a Non-Existant File */ diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/testinfo.dat deleted file mode 100644 index 6135ede5bc7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFileAttributesExW -Name = Test with normal file/dir and readonly file/dir and hidden file/dir -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the GetFileAttributesExW function. -= Call the function on a normal directory and file and a read-only directory -= and file and a hidden file and directory. -= Ensure that the attributes returned are correct, and the -= file times and file sizes. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt deleted file mode 100644 index fb59139042f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getfileattributesexw_test2 - ${SOURCES} -) - -add_dependencies(paltest_getfileattributesexw_test2 coreclrpal) - -target_link_libraries(paltest_getfileattributesexw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp index f5fea17222d..31fe689214e 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp @@ -32,7 +32,7 @@ static int IsFileTimeOk(FILETIME FirstTime, FILETIME SecondTime) return(TimeOne <= TimeTwo); } -int __cdecl main(int argc, char **argv) +PALTEST(file_io_GetFileAttributesExW_test2_paltest_getfileattributesexw_test2, "file_io/GetFileAttributesExW/test2/paltest_getfileattributesexw_test2") { DWORD res; char fileName[MAX_PATH] = "test_file"; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/testinfo.dat deleted file mode 100644 index af5d031cd28..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFileAttributesExW -Name = Test for GetFileAttributesExW -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the GetFileAttributesExW function. -= First get a file's attributes, modify the file, re-get its attributes -= and compare the two sets of attributes diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_ro_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_ro_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/.hidden_ro_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt deleted file mode 100644 index 039375e839f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -set(SOURCES - GetFileAttributesW.cpp -) - -add_executable(paltest_getfileattributesw_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfileattributesw_test1 coreclrpal) - -target_link_libraries(paltest_getfileattributesw_test1 - ${COMMON_TEST_LIBRARIES} -) -add_subdirectory(.hidden_directory) -add_subdirectory(.hidden_ro_directory) -add_subdirectory(normal_test_directory) -add_subdirectory(no_directory) -add_subdirectory(ro_test_directory) -add_subdirectory(rw_test_directory) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp index 48e1013db39..7efc9f88053 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp @@ -38,41 +38,41 @@ typedef struct int isFile; /* is file (1) or dir (0) */ }TestCaseDir; -DWORD desiredAccessFile = GENERIC_READ | GENERIC_WRITE; -DWORD shareModeFile = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; -LPSECURITY_ATTRIBUTES lpAttrFile = NULL; -DWORD dwCreationDispFile = CREATE_NEW; -DWORD dwFlagsAttribFile = FILE_ATTRIBUTE_NORMAL; -HANDLE hTemplateFile = NULL; +DWORD desiredAccessFile_GetFileAttributesW_test1 = GENERIC_READ | GENERIC_WRITE; +DWORD shareModeFile_GetFileAttributesW_test1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; +LPSECURITY_ATTRIBUTES lpAttrFile_GetFileAttributesW_test1 = NULL; +DWORD dwCreationDispFile_GetFileAttributesW_test1 = CREATE_NEW; +DWORD dwFlagsAttribFile_GetFileAttributesW_test1 = FILE_ATTRIBUTE_NORMAL; +HANDLE hTemplateFile_GetFileAttributesW_test1 = NULL; -int numFileTests = 6; -TestCaseFile gfaTestsFile[6]; /* GetFileAttributes tests list */ +int numFileTests_GetFileAttributesW_test1 = 6; +TestCaseFile gfaTestsFile_GetFileAttributesW_test1[6]; /* GetFileAttributes tests list */ -int numDirTests = 6; -TestCaseDir gfaTestsDir[6]; /* GetFileAttributes tests list */ +int numDirTests_GetFileAttributesW_test1 = 6; +TestCaseDir gfaTestsDir_GetFileAttributesW_test1[6]; /* GetFileAttributes tests list */ -BOOL CleanUpFiles() +BOOL CleanUpFiles_GetFileAttributesW_test1() { DWORD dwAtt; int i; BOOL result = TRUE; - for (i = 0; i < numFileTests - 1 ; i++ ) + for (i = 0; i < numFileTests_GetFileAttributesW_test1 - 1 ; i++ ) { - dwAtt = GetFileAttributesA(gfaTestsFile[i].name); + dwAtt = GetFileAttributesA(gfaTestsFile_GetFileAttributesW_test1[i].name); if( dwAtt != INVALID_FILE_ATTRIBUTES ) { //Trace("Files iteration %d\n", i); - if(!SetFileAttributesA (gfaTestsFile[i].name, FILE_ATTRIBUTE_NORMAL)) + if(!SetFileAttributesA (gfaTestsFile_GetFileAttributesW_test1[i].name, FILE_ATTRIBUTE_NORMAL)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, FILE_ATTRIBUTE_NORMAL); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile_GetFileAttributesW_test1[i].name, FILE_ATTRIBUTE_NORMAL); } - if(!DeleteFileA (gfaTestsFile[i].name)) + if(!DeleteFileA (gfaTestsFile_GetFileAttributesW_test1[i].name)) { result = FALSE; - Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, dwAtt); + Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsFile_GetFileAttributesW_test1[i].name, dwAtt); } } @@ -80,58 +80,58 @@ BOOL CleanUpFiles() // Trace("Value of result is %d\n", result); return result; } -BOOL SetUpFiles() +BOOL SetUpFiles_GetFileAttributesW_test1() { int i = 0; BOOL result = TRUE; - for (i = 0; i < numFileTests - 1 ; i++ ) + for (i = 0; i < numFileTests_GetFileAttributesW_test1 - 1 ; i++ ) { - gfaTestsFile[i].hFile = CreateFile(gfaTestsFile[i].name, - desiredAccessFile, - shareModeFile, - lpAttrFile, - dwCreationDispFile, - dwFlagsAttribFile, - hTemplateFile); - - if( gfaTestsFile[i].hFile == NULL ) + gfaTestsFile_GetFileAttributesW_test1[i].hFile = CreateFile(gfaTestsFile_GetFileAttributesW_test1[i].name, + desiredAccessFile_GetFileAttributesW_test1, + shareModeFile_GetFileAttributesW_test1, + lpAttrFile_GetFileAttributesW_test1, + dwCreationDispFile_GetFileAttributesW_test1, + dwFlagsAttribFile_GetFileAttributesW_test1, + hTemplateFile_GetFileAttributesW_test1); + + if( gfaTestsFile_GetFileAttributesW_test1[i].hFile == NULL ) { Fail("Error while creating files for iteration %d\n", i); } - if(!SetFileAttributesA (gfaTestsFile[i].name, gfaTestsFile[i].expectedAttribs)) + if(!SetFileAttributesA (gfaTestsFile_GetFileAttributesW_test1[i].name, gfaTestsFile_GetFileAttributesW_test1[i].expectedAttribs)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile[i].name, gfaTestsFile[i].expectedAttribs); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsFile_GetFileAttributesW_test1[i].name, gfaTestsFile_GetFileAttributesW_test1[i].expectedAttribs); } } return result; } -BOOL CleanUpDirs() +BOOL CleanUpDirs_GetFileAttributesW_test1() { DWORD dwAtt; int i; BOOL result = TRUE; - for (i = 0; i < numDirTests - 1; i++ ) + for (i = 0; i < numDirTests_GetFileAttributesW_test1 - 1; i++ ) { - dwAtt = GetFileAttributesA(gfaTestsDir[i].name); + dwAtt = GetFileAttributesA(gfaTestsDir_GetFileAttributesW_test1[i].name); if( dwAtt != INVALID_FILE_ATTRIBUTES ) { - if(!SetFileAttributesA (gfaTestsDir[i].name, FILE_ATTRIBUTE_DIRECTORY)) + if(!SetFileAttributesA (gfaTestsDir_GetFileAttributesW_test1[i].name, FILE_ATTRIBUTE_DIRECTORY)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, (FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY)); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir_GetFileAttributesW_test1[i].name, (FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY)); } - LPWSTR nameW = convert(gfaTestsDir[i].name); + LPWSTR nameW = convert(gfaTestsDir_GetFileAttributesW_test1[i].name); if(!RemoveDirectoryW (nameW)) { result = FALSE; - Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, dwAtt); + Trace("ERROR:%d: Error deleting file [%s][%d]\n", GetLastError(), gfaTestsDir_GetFileAttributesW_test1[i].name, dwAtt); } free(nameW); @@ -141,14 +141,14 @@ BOOL CleanUpDirs() return result; } -BOOL SetUpDirs() +BOOL SetUpDirs_GetFileAttributesW_test1() { int i = 0; BOOL result = TRUE; DWORD ret = 0; - for (i = 0; i < numDirTests - 1; i++ ) + for (i = 0; i < numDirTests_GetFileAttributesW_test1 - 1; i++ ) { - result = CreateDirectoryA(gfaTestsDir[i].name, + result = CreateDirectoryA(gfaTestsDir_GetFileAttributesW_test1[i].name, NULL); if(!result ) @@ -157,25 +157,25 @@ BOOL SetUpDirs() Fail("Error while creating directory for iteration %d\n", i); } - if(!SetFileAttributesA (gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs)) + if(!SetFileAttributesA (gfaTestsDir_GetFileAttributesW_test1[i].name, gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs)) { result = FALSE; - Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs); + Trace("ERROR:%d: Error setting attributes [%s][%d]\n", GetLastError(), gfaTestsDir_GetFileAttributesW_test1[i].name, gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs); } - ret = GetFileAttributesA (gfaTestsDir[i].name); - if(ret != gfaTestsDir[i].expectedAttribs) + ret = GetFileAttributesA (gfaTestsDir_GetFileAttributesW_test1[i].name); + if(ret != gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs) { result = FALSE; - Trace("ERROR: Error setting attributes [%s][%d]\n", gfaTestsDir[i].name, gfaTestsDir[i].expectedAttribs); + Trace("ERROR: Error setting attributes [%s][%d]\n", gfaTestsDir_GetFileAttributesW_test1[i].name, gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs); } - // Trace("Setup Dir setting attr [%d], returned [%d]\n", gfaTestsDir[i].expectedAttribs, ret); + // Trace("Setup Dir setting attr [%d], returned [%d]\n", gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs, ret); } // Trace("Setup dirs returning %d\n", result); return result; } -int __cdecl main(int argc, char **argv) +PALTEST(file_io_GetFileAttributesW_test1_paltest_getfileattributesw_test1, "file_io/GetFileAttributesW/test1/paltest_getfileattributesw_test1") { int i; BOOL bFailed = FALSE; @@ -197,61 +197,61 @@ int __cdecl main(int argc, char **argv) WCHAR *WStr; /* Tests on directory */ - gfaTestsDir[0].name = NormalDirectoryName; - gfaTestsDir[0].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; - gfaTestsDir[0].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[0].name = NormalDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[0].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; + gfaTestsDir_GetFileAttributesW_test1[0].isFile = TYPE_DIR; - gfaTestsDir[1].name = ReadOnlyDirectoryName; - gfaTestsDir[1].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | + gfaTestsDir_GetFileAttributesW_test1[1].name = ReadOnlyDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[1].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY; - gfaTestsDir[1].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[1].isFile = TYPE_DIR; - gfaTestsDir[2].name = ReadWriteDirectoryName; - gfaTestsDir[2].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; - gfaTestsDir[2].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[2].name = ReadWriteDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[2].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; + gfaTestsDir_GetFileAttributesW_test1[2].isFile = TYPE_DIR; - gfaTestsDir[3].name = HiddenDirectoryName; - gfaTestsDir[3].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; //| + gfaTestsDir_GetFileAttributesW_test1[3].name = HiddenDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[3].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsDir[3].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[3].isFile = TYPE_DIR; - gfaTestsDir[4].name = HiddenReadOnlyDirectoryName; - gfaTestsDir[4].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | + gfaTestsDir_GetFileAttributesW_test1[4].name = HiddenReadOnlyDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[4].expectedAttribs = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsDir[4].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[4].isFile = TYPE_DIR; - gfaTestsDir[5].name = NoDirectoryName; - gfaTestsDir[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; - gfaTestsDir[5].isFile = TYPE_DIR; + gfaTestsDir_GetFileAttributesW_test1[5].name = NoDirectoryName; + gfaTestsDir_GetFileAttributesW_test1[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; + gfaTestsDir_GetFileAttributesW_test1[5].isFile = TYPE_DIR; /* Tests on file */ - gfaTestsFile[0].name = NormalFileName; - gfaTestsFile[0].expectedAttribs = FILE_ATTRIBUTE_NORMAL; - gfaTestsFile[0].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[0].name = NormalFileName; + gfaTestsFile_GetFileAttributesW_test1[0].expectedAttribs = FILE_ATTRIBUTE_NORMAL; + gfaTestsFile_GetFileAttributesW_test1[0].isFile = TYPE_FILE; - gfaTestsFile[1].name = ReadOnlyFileName; - gfaTestsFile[1].expectedAttribs = FILE_ATTRIBUTE_READONLY; - gfaTestsFile[1].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[1].name = ReadOnlyFileName; + gfaTestsFile_GetFileAttributesW_test1[1].expectedAttribs = FILE_ATTRIBUTE_READONLY; + gfaTestsFile_GetFileAttributesW_test1[1].isFile = TYPE_FILE; - gfaTestsFile[2].name = ReadWriteFileName; - gfaTestsFile[2].expectedAttribs = FILE_ATTRIBUTE_NORMAL; - gfaTestsFile[2].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[2].name = ReadWriteFileName; + gfaTestsFile_GetFileAttributesW_test1[2].expectedAttribs = FILE_ATTRIBUTE_NORMAL; + gfaTestsFile_GetFileAttributesW_test1[2].isFile = TYPE_FILE; - gfaTestsFile[3].name = HiddenFileName; - gfaTestsFile[3].expectedAttribs = FILE_ATTRIBUTE_NORMAL; //FILE_ATTRIBUTE_HIDDEN; - gfaTestsFile[3].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[3].name = HiddenFileName; + gfaTestsFile_GetFileAttributesW_test1[3].expectedAttribs = FILE_ATTRIBUTE_NORMAL; //FILE_ATTRIBUTE_HIDDEN; + gfaTestsFile_GetFileAttributesW_test1[3].isFile = TYPE_FILE; - gfaTestsFile[4].name = HiddenReadOnlyFileName; - gfaTestsFile[4].expectedAttribs = FILE_ATTRIBUTE_READONLY; //| + gfaTestsFile_GetFileAttributesW_test1[4].name = HiddenReadOnlyFileName; + gfaTestsFile_GetFileAttributesW_test1[4].expectedAttribs = FILE_ATTRIBUTE_READONLY; //| //FILE_ATTRIBUTE_HIDDEN; - gfaTestsFile[4].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[4].isFile = TYPE_FILE; - gfaTestsFile[5].name = NotReallyAFileName; - gfaTestsFile[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; - gfaTestsFile[5].isFile = TYPE_FILE; + gfaTestsFile_GetFileAttributesW_test1[5].name = NotReallyAFileName; + gfaTestsFile_GetFileAttributesW_test1[5].expectedAttribs = INVALID_FILE_ATTRIBUTES; + gfaTestsFile_GetFileAttributesW_test1[5].isFile = TYPE_FILE; /* Initialize PAL environment */ if (0 != PAL_Initialize(argc,argv)) @@ -259,22 +259,22 @@ int __cdecl main(int argc, char **argv) return FAIL; } - if(!CleanUpFiles()) + if(!CleanUpFiles_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: Pre-Clean Up Files Failed\n"); } - if(0 == SetUpFiles()) + if(0 == SetUpFiles_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: SetUp Files Failed\n"); } - if(!CleanUpDirs()) + if(!CleanUpDirs_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: Pre-Clean Up Directories Failed\n"); } - if(!SetUpDirs()) + if(!SetUpDirs_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: SetUp Directories Failed\n"); } @@ -284,53 +284,53 @@ int __cdecl main(int argc, char **argv) * call GetFileAttributesW on the name and * make sure the return value is the one expected */ - for( i = 0; i < numFileTests; i++ ) + for( i = 0; i < numFileTests_GetFileAttributesW_test1; i++ ) { - WStr = convert(gfaTestsFile[i].name); + WStr = convert(gfaTestsFile_GetFileAttributesW_test1[i].name); result = GetFileAttributesW(WStr); - if( result != gfaTestsFile[i].expectedAttribs ) + if( result != gfaTestsFile_GetFileAttributesW_test1[i].expectedAttribs ) { bFailed = TRUE; Trace("ERROR: GetFileAttributesW Test#%u on %s " "returned %u instead of %u. \n", i, - gfaTestsFile[i].name, + gfaTestsFile_GetFileAttributesW_test1[i].name, result, - gfaTestsFile[i].expectedAttribs); + gfaTestsFile_GetFileAttributesW_test1[i].expectedAttribs); } free(WStr); } - for( i = 0; i < numDirTests; i++ ) + for( i = 0; i < numDirTests_GetFileAttributesW_test1; i++ ) { - WStr = convert(gfaTestsDir[i].name); + WStr = convert(gfaTestsDir_GetFileAttributesW_test1[i].name); result = GetFileAttributesW(WStr); - if( result != gfaTestsDir[i].expectedAttribs ) + if( result != gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs ) { bFailed = TRUE; Trace("ERROR: GetFileAttributesW on Directories Test#%u on %s " "returned %u instead of %u. \n", i, - gfaTestsDir[i].name, + gfaTestsDir_GetFileAttributesW_test1[i].name, result, - gfaTestsDir[i].expectedAttribs); + gfaTestsDir_GetFileAttributesW_test1[i].expectedAttribs); } free(WStr); } - if(!CleanUpFiles()) + if(!CleanUpFiles_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: Post-Clean Up Files Failed\n"); } - if(!CleanUpDirs()) + if(!CleanUpDirs_GetFileAttributesW_test1()) { Fail("GetFileAttributesW: Post-Clean Up Directories Failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/no_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/no_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/no_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/normal_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/normal_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/normal_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/ro_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/ro_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/ro_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/rw_test_directory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/rw_test_directory/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/rw_test_directory/CMakeLists.txt +++ /dev/null diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/testinfo.dat deleted file mode 100644 index e837aeae70a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/testinfo.dat +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 - -Section = file_io - -Function = GetFileAttributesW - -Name = Positive Test for GetFileAttributesW - -TYPE = DEFAULT - -EXE1 = getfileattributesw - -Description - -= Test the GetFileAttributesW function - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt deleted file mode 100644 index fa5a8b3470c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetFileSize.cpp -) - -add_executable(paltest_getfilesize_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfilesize_test1 coreclrpal) - -target_link_libraries(paltest_getfilesize_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp index f66d5b94054..4a58e113a93 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp @@ -12,9 +12,9 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -void CleanUp(HANDLE hFile) + +void CleanUp_GetFileSize_test1(HANDLE hFile) { if (CloseHandle(hFile) != TRUE) { @@ -28,7 +28,7 @@ void CleanUp(HANDLE hFile) } } -void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) +void CheckFileSize_GetFileSize_test1(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) { DWORD dwRc = 0; DWORD dwReturnedHighOrder = 0; @@ -39,7 +39,7 @@ void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) { Trace("GetFileSize: ERROR -> Call to SetFilePointer failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail(""); } else @@ -48,21 +48,21 @@ void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) { Trace("GetFileSize: ERROR -> Call to SetEndOfFile failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail(""); } dwReturnedOffset = GetFileSize(hFile, &dwReturnedHighOrder); if ((dwReturnedOffset != dwOffset) || (dwReturnedHighOrder != dwHighOrder)) { - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail("GetFileSize: ERROR -> File sizes do not match up.\n"); } } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFileSize_test1_paltest_getfilesize_test1, "file_io/GetFileSize/test1/paltest_getfilesize_test1") { HANDLE hFile = NULL; DWORD dwRc = 0; @@ -126,14 +126,14 @@ int __cdecl main(int argc, char *argv[]) } /* give the file a size */ - CheckFileSize(hFile, 256, 0); + CheckFileSize_GetFileSize_test1(hFile, 256, 0); /* make the file large using the high order option */ - CheckFileSize(hFile, 256, 1); + CheckFileSize_GetFileSize_test1(hFile, 256, 1); /* set the file size to zero */ - CheckFileSize(hFile, 0, 0); + CheckFileSize_GetFileSize_test1(hFile, 0, 0); /* test if file size changes by writing to it. */ /* get file size */ @@ -144,7 +144,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("GetFileSize: ERROR -> Call to WriteFile failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail(""); } @@ -153,7 +153,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("GetFileSize: ERROR -> Call to FlushFileBuffers failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail(""); } @@ -161,12 +161,12 @@ int __cdecl main(int argc, char *argv[]) dwRc2 = GetFileSize(hFile, NULL); if((dwRc2-dwRc) !=strlen(data)) { - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); Fail("GetFileSize: ERROR -> File size did not increase properly after.\n" "writing %d chars\n", strlen(data)); } - CleanUp(hFile); + CleanUp_GetFileSize_test1(hFile); PAL_Terminate(); return PASS; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/testinfo.dat deleted file mode 100644 index ea1c1021d5e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSize/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFileSize -Name = Positive Test for GetFileSize (test 1) -Type = DEFAULT -EXE1 = getfilesize -Description -= Test GetFileSize on a NULL handle and valid file handles - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt deleted file mode 100644 index 6de183f9563..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetFileSizeEx.cpp -) - -add_executable(paltest_getfilesizeex_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfilesizeex_test1 coreclrpal) - -target_link_libraries(paltest_getfilesizeex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp index 3361047c271..1268fad4200 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp @@ -12,9 +12,9 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -void CleanUp(HANDLE hFile) + +void CleanUp_GetFileSizeEx_test1(HANDLE hFile) { if (CloseHandle(hFile) != TRUE) { @@ -30,7 +30,7 @@ void CleanUp(HANDLE hFile) } } -void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) +void CheckFileSize_GetFileSizeEx_test1(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) { DWORD dwRc = 0; DWORD dwError = 0; @@ -41,7 +41,7 @@ void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) { Trace("GetFileSizeEx: ERROR -> Call to SetFilePointer failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); Fail(""); } else @@ -49,7 +49,7 @@ void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) if (!SetEndOfFile(hFile)) { dwError = GetLastError(); - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); if (dwError == 112) { Fail("GetFileSizeEx: ERROR -> SetEndOfFile failed due to lack of " @@ -67,14 +67,14 @@ void CheckFileSize(HANDLE hFile, DWORD dwOffset, DWORD dwHighOrder) if ((qwFileSize.u.LowPart != dwOffset) || (qwFileSize.u.HighPart != dwHighOrder)) { - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); Fail("GetFileSizeEx: ERROR -> File sizes do not match up.\n"); } } } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFileSizeEx_test1_paltest_getfilesizeex_test1, "file_io/GetFileSizeEx/test1/paltest_getfilesizeex_test1") { HANDLE hFile = NULL; BOOL bRc = FALSE; @@ -126,14 +126,14 @@ int __cdecl main(int argc, char *argv[]) } /* give the file a size */ - CheckFileSize(hFile, 256, 0); + CheckFileSize_GetFileSizeEx_test1(hFile, 256, 0); /* make the file large using the high order option */ - CheckFileSize(hFile, 256, 1); + CheckFileSize_GetFileSizeEx_test1(hFile, 256, 1); /* set the file size to zero */ - CheckFileSize(hFile, 0, 0); + CheckFileSize_GetFileSizeEx_test1(hFile, 0, 0); /* test if file size changes by writing to it. */ /* get file size */ @@ -144,7 +144,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("GetFileSizeEx: ERROR -> Call to WriteFile failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); Fail(""); } @@ -153,7 +153,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("GetFileSizeEx: ERROR -> Call to FlushFileBuffers failed with %ld.\n", GetLastError()); - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); Fail(""); } @@ -161,12 +161,12 @@ int __cdecl main(int argc, char *argv[]) GetFileSizeEx(hFile, &qwFileSize2); if((qwFileSize2.QuadPart-qwFileSize.QuadPart) !=strlen(data)) { - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); Fail("GetFileSizeEx: ERROR -> File size did not increase properly after.\n" "writing %d chars\n", strlen(data)); } - CleanUp(hFile); + CleanUp_GetFileSizeEx_test1(hFile); PAL_Terminate(); return PASS; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/testinfo.dat deleted file mode 100644 index 587113c3556..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFileSizeEx -Name = Positive Test for GetFileSizeEx (test 1) -Type = DEFAULT -EXE1 = getfilesizeex -Description -= Test GetFileSizeEx on a NULL handle and valid file handles - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt deleted file mode 100644 index a531511937a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetFullPathNameA.cpp -) - -add_executable(paltest_getfullpathnamea_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamea_test1 coreclrpal) - -target_link_libraries(paltest_getfullpathnamea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp index eda6f130c4f..18aee4bba03 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp @@ -12,10 +12,10 @@ #include <palsuite.h> -const char* szFileName = "testing.tmp"; - -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFullPathNameA_test1_paltest_getfullpathnamea_test1, "file_io/GetFullPathNameA/test1/paltest_getfullpathnamea_test1") { + const char* szFileName = "testing.tmp"; + DWORD dwRc = 0; char szReturnedPath[_MAX_DIR+1]; char szShortBuff[2]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/testinfo.dat deleted file mode 100644 index f5191c648a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameA -Name = Test for GetFullPathNameA (test 1) -Type = DEFAULT -EXE1 = getfullpathnamea -Description -= Get the full path for a file name and verify the results. -= Also, attempt to call GetFullPathNameA with a buffer that is -= too small for the returned path and verify the results. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt deleted file mode 100644 index fc400bd67a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getfullpathnamea_test2 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamea_test2 coreclrpal) - -target_link_libraries(paltest_getfullpathnamea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp index caec7d8be8d..b63e61f33e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp @@ -17,11 +17,11 @@ #include <palsuite.h> -const char* szDotDot = "..\\"; -const char* szFileName = "testing.tmp"; - -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFullPathNameA_test2_paltest_getfullpathnamea_test2, "file_io/GetFullPathNameA/test2/paltest_getfullpathnamea_test2") { + const char* szDotDot = "..\\"; + const char* szFileName = "testing.tmp"; + DWORD dwRc = 0; char szReturnedPath[_MAX_DIR+1]; char szFullFileName[_MAX_DIR+1]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/testinfo.dat deleted file mode 100644 index fd72c84010f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameA -Name = Test for GetFullPathNameA -Type = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the GetFullPathNameA API. -= GetFullPathA will be passed a directory that contains '..'. -= To add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. -= The test will create a file with in the parent directory -= to verify that the returned directory is valid. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt deleted file mode 100644 index 0877aae13d7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_getfullpathnamea_test3 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamea_test3 coreclrpal) - -target_link_libraries(paltest_getfullpathnamea_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp index 54c53955465..b098719bb1f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp @@ -29,17 +29,18 @@ #include <palsuite.h> + +PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/GetFullPathNameA/test3/paltest_getfullpathnamea_test3") +{ #ifdef WIN32 const char* szSeperator = "\\"; #else const char* szSeperator = "//"; #endif -const char* szDotDot = "..\\"; -const char* szFileName = "testing.tmp"; + const char* szDotDot = "..\\"; + const char* szFileName = "testing.tmp"; -int __cdecl main(int argc, char *argv[]) -{ DWORD dwRc = 0; char szReturnedPath[_MAX_DIR+1]; char szFullFileName[_MAX_DIR+1]; @@ -235,6 +236,6 @@ cleanUpOne: free (szCreatedDirW); /* Terminate the PAL.*/ - PAL_Terminate(); + PAL_TerminateEx(bRetVal); return bRetVal; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/testinfo.dat deleted file mode 100644 index 1a1de6d9555..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameA -Name = Test for GetFullPathNameA -Type = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the GetFullPathNameA API. -= GetFullPathA will be passed a directory that contains '..'. -= Example: test_directory\level1\..\testing.tmp. -= To add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. -= The test will create a file with in the parent directory -= to verify that the returned directory is valid. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt deleted file mode 100644 index ec502f5d0e2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_getfullpathnamea_test4 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamea_test4 coreclrpal) - -target_link_libraries(paltest_getfullpathnamea_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp index fd9879b03c8..f463aec087f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp @@ -29,17 +29,18 @@ #include <palsuite.h> + +PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/GetFullPathNameA/test4/paltest_getfullpathnamea_test4") +{ #ifdef WIN32 const char* szSeperator = "\\"; #else const char* szSeperator = "//"; #endif -const char* szDotDot = ".."; -const char* szFileName = "testing.tmp"; + const char* szDotDot = ".."; + const char* szFileName = "testing.tmp"; -int __cdecl main(int argc, char *argv[]) -{ DWORD dwRc = 0; char szReturnedPath[_MAX_DIR+1]; char szFullFileName[_MAX_DIR+1]; @@ -197,6 +198,6 @@ cleanUpOne: free (szCreatedDirW); /* Terminate the PAL.*/ - PAL_Terminate(); + PAL_TerminateEx(bRetVal); return bRetVal; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/testinfo.dat deleted file mode 100644 index 9480549d73e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameA -Name = Test for GetFullPathNameA -Type = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the GetFullPathNameA API. -= GetFullPathA will be passed a directory that begins with '..'. -= Example: ..\test_directory\level1\testing.tmp. -= To add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. -= The test will create a file with in the parent directory -= to verify that the returned directory is valid. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt deleted file mode 100644 index edae18d6151..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetFullPathNameW.cpp -) - -add_executable(paltest_getfullpathnamew_test1 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamew_test1 coreclrpal) - -target_link_libraries(paltest_getfullpathnamew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp index e4562132016..281c2023016 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp @@ -12,10 +12,10 @@ #include <palsuite.h> -const char* szFileName = "testing.tmp"; - -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFullPathNameW_test1_paltest_getfullpathnamew_test1, "file_io/GetFullPathNameW/test1/paltest_getfullpathnamew_test1") { + const char* szFileName = "testing.tmp"; + DWORD dwRc = 0; WCHAR szwReturnedPath[_MAX_DIR+1]; WCHAR szwShortBuff[2]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/testinfo.dat deleted file mode 100644 index 4b7448ddb44..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameW -Name = Test for GetFullPathNameW (test 1) -Type = DEFAULT -EXE1 = getfullpathnamew -Description -= Get the full path for a file name and verify the results. -= Also, attempt to call GetFullPathNameW with a buffer that is -= too small for the returned path and verify the results. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt deleted file mode 100644 index 9d19bf00172..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getfullpathnamew_test2 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamew_test2 coreclrpal) - -target_link_libraries(paltest_getfullpathnamew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp index 3faaffa3f5c..57fa29130c6 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp @@ -16,11 +16,11 @@ #include <palsuite.h> -WCHAR szwDotDot[] = {'.','.','\\','\0'}; -WCHAR szwFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; - -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetFullPathNameW_test2_paltest_getfullpathnamew_test2, "file_io/GetFullPathNameW/test2/paltest_getfullpathnamew_test2") { + WCHAR szwDotDot[] = {'.','.','\\','\0'}; + WCHAR szwFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; + DWORD dwRc = 0; WCHAR szwReturnedPath[_MAX_DIR+1]; WCHAR szwFullFileName[_MAX_DIR+1]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/testinfo.dat deleted file mode 100644 index facd0940b06..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameW -Name = Test for GetFullPathNameW (test 2) -Type = DEFAULT -EXE1 = test2 -Description -= Get the full path for a file name and verify the results. -= This test will use a relative path, containing '..\'. To -= add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt deleted file mode 100644 index c91e8bc1ec1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_getfullpathnamew_test3 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamew_test3 coreclrpal) - -target_link_libraries(paltest_getfullpathnamew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp index ca2b13bc515..24fa5eff8fa 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp @@ -29,17 +29,17 @@ #define UNICODE #include <palsuite.h> +PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/GetFullPathNameW/test3/paltest_getfullpathnamew_test3") +{ #ifdef WIN32 -const WCHAR szSeperator[] = {'\\','\\','\0'}; + const WCHAR szSeperator[] = {'\\','\\','\0'}; #else -const WCHAR szSeperator[] = {'/','/','\0'}; + const WCHAR szSeperator[] = {'/','/','\0'}; #endif -const WCHAR szDotDot[] = {'.','.','\0'}; -const WCHAR szFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; + const WCHAR szDotDot[] = {'.','.','\0'}; + const WCHAR szFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; -int __cdecl main(int argc, char *argv[]) -{ DWORD dwRc = 0; WCHAR szReturnedPath[_MAX_DIR+1]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/testinfo.dat deleted file mode 100644 index fe20866ad7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameW -Name = Test for GetFullPathNameW -Type = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the GetFullPathNameW API. -= GetFullPathW will be passed a directory that contains '..'. -= Example: test_directory\level1\..\testing.tmp. -= To add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. -= The test will create a file with in the parent directory -= to verify that the returned directory is valid. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt deleted file mode 100644 index a838b4639b8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_getfullpathnamew_test4 - ${SOURCES} -) - -add_dependencies(paltest_getfullpathnamew_test4 coreclrpal) - -target_link_libraries(paltest_getfullpathnamew_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp index 6976dcd4079..752abfc0605 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp @@ -29,17 +29,17 @@ #define UNICODE #include <palsuite.h> +PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/GetFullPathNameW/test4/paltest_getfullpathnamew_test4") +{ #ifdef WIN32 const WCHAR szSeperator[] = {'\\','\\','\0'}; #else const WCHAR szSeperator[] = {'/','/','\0'}; #endif -const WCHAR szDotDot[] = {'.','.','\0'}; -const WCHAR szFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; + const WCHAR szDotDot[] = {'.','.','\0'}; + const WCHAR szFileName[] = {'t','e','s','t','i','n','g','.','t','m','p','\0'}; -int __cdecl main(int argc, char *argv[]) -{ DWORD dwRc = 0; WCHAR szReturnedPath[_MAX_DIR+1]; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/testinfo.dat deleted file mode 100644 index 9480549d73e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetFullPathNameA -Name = Test for GetFullPathNameA -Type = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the GetFullPathNameA API. -= GetFullPathA will be passed a directory that begins with '..'. -= Example: ..\test_directory\level1\testing.tmp. -= To add to this test, we will also call SetCurrentDirectory to -= ensure this is handled properly. -= The test will create a file with in the parent directory -= to verify that the returned directory is valid. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt deleted file mode 100644 index 4fe9d389649..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetStdHandle.cpp -) - -add_executable(paltest_getstdhandle_test1 - ${SOURCES} -) - -add_dependencies(paltest_getstdhandle_test1 coreclrpal) - -target_link_libraries(paltest_getstdhandle_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp index 3120d180f10..ac68e4938c0 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetStdHandle_test1_paltest_getstdhandle_test1, "file_io/GetStdHandle/test1/paltest_getstdhandle_test1") { HANDLE hFile = NULL; DWORD dwBytesWritten = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/testinfo.dat deleted file mode 100644 index be8b8fc3dbf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetStdHandle -Name = Positive Test for GetStdHandle (test 1) -Type = DEFAULT -EXE1 = getstdhandle -Description -= Test GetStdHandle on a valid/invalid std handles - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt deleted file mode 100644 index 1855b4ae1a0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetStdHandle.cpp -) - -add_executable(paltest_getstdhandle_test2 - ${SOURCES} -) - -add_dependencies(paltest_getstdhandle_test2 coreclrpal) - -target_link_libraries(paltest_getstdhandle_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp index 91d175b58e3..65879cd9153 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetStdHandle_test2_paltest_getstdhandle_test2, "file_io/GetStdHandle/test2/paltest_getstdhandle_test2") { HANDLE hFile = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/testinfo.dat deleted file mode 100644 index b4bcbaa71ee..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetStdHandle/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetStdHandle -Name = Positive Test for GetStdHandle (test 2) -Type = DEFAULT -EXE1 = getstdhandle -Description -= Smoke Test GetStdHandle on a valid/invalid std handles - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt deleted file mode 100644 index d738faed8ab..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getsystemtime_test1 - ${SOURCES} -) - -add_dependencies(paltest_getsystemtime_test1 coreclrpal) - -target_link_libraries(paltest_getsystemtime_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp index fe5e01869a9..a589cb97640 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetSystemTime_test1_paltest_getsystemtime_test1, "file_io/GetSystemTime/test1/paltest_getsystemtime_test1") { SYSTEMTIME TheTime; SYSTEMTIME firstTime; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/testinfo.dat deleted file mode 100644 index f96f4770ac1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTime/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetSystemTime -Name = Positive test of GetSystemTime -Type = DEFAULT -EXE1 = test -Description -= Tests the PAL implementation of the GetSystemTime API diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt deleted file mode 100644 index 5515d8a19ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetSystemTimeAsFileTime.cpp -) - -add_executable(paltest_getsystemtimeasfiletime_test1 - ${SOURCES} -) - -add_dependencies(paltest_getsystemtimeasfiletime_test1 coreclrpal) - -target_link_libraries(paltest_getsystemtimeasfiletime_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp index c17cbccd69f..71b65aa3cc4 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(file_io_GetSystemTimeAsFileTime_test1_paltest_getsystemtimeasfiletime_test1, "file_io/GetSystemTimeAsFileTime/test1/paltest_getsystemtimeasfiletime_test1") { FILETIME TheFirstTime, TheSecondTime; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/testinfo.dat deleted file mode 100644 index 3b0c0d99cb6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetSystemTimeAsFileTime -Name = Positive Test for GetSystemTimeAsFileTime -TYPE = DEFAULT -EXE1 = getsystemtimeasfiletime -Description -= Test the GetSystemTimeAsFileTime function. -= Take two times, three seconds apart, and ensure that the time is -= increasing, and that it has increased at least 3 seconds. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt deleted file mode 100644 index 204af67ba3e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetTempFileNameA.cpp -) - -add_executable(paltest_gettempfilenamea_test1 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamea_test1 coreclrpal) - -target_link_libraries(paltest_gettempfilenamea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp index c5e26784fc0..e93d2d9840c 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameA_test1_paltest_gettempfilenamea_test1, "file_io/GetTempFileNameA/test1/paltest_gettempfilenamea_test1") { UINT uiError = 0; const UINT uUnique = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/testinfo.dat deleted file mode 100644 index 452858aa691..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameA -Name = Test for GetTempFileNameA (test 1) -Type = DEFAULT -EXE1 = gettempfilenamea -Description -= Tests the PAL implimentation of GetTempFileNameA by testing -= various combinations of path and prefix names. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt deleted file mode 100644 index 440f991a8f4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetTempFileNameA.cpp -) - -add_executable(paltest_gettempfilenamea_test2 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamea_test2 coreclrpal) - -target_link_libraries(paltest_gettempfilenamea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp index c6412884497..9edaf483985 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp @@ -18,7 +18,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameA_test2_paltest_gettempfilenamea_test2, "file_io/GetTempFileNameA/test2/paltest_gettempfilenamea_test2") { UINT uiError = 0; DWORD dwError = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/testinfo.dat deleted file mode 100644 index 61042b1695a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameA -Name = Test for GetTempFileNameA (test 2) -Type = DEFAULT -EXE1 = gettempfilenamea -Description -= Test the number of files that can be created. Since -= GetTempFileNameA only handles 8.3 file names, the test -= attempts to create more than the maximum temp files possible -= with a 3 character prefix. Since this test takes so long, it -= is not to be included in the standard test harness. -= This test will also need more than 4.07 GB free disk space. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt deleted file mode 100644 index 942d92675b8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - gettempfilenamea.cpp -) - -add_executable(paltest_gettempfilenamea_test3 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamea_test3 coreclrpal) - -target_link_libraries(paltest_gettempfilenamea_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp index 4cb3581d2b8..fa9112c49f1 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp @@ -24,7 +24,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameA_test3_paltest_gettempfilenamea_test3, "file_io/GetTempFileNameA/test3/paltest_gettempfilenamea_test3") { const UINT uUnique = 0; UINT uiError; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/testinfo.dat deleted file mode 100644 index 00ef5135af6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameA -Name = Test for GetTempFileNameA (test 3) -Type = DEFAULT -EXE1 = gettempfilenamea -Description -= Tests the PAL implementation of the GetTempFileNameA function. -= Checks the file attributes and ensures that getting a file name, -= deleting the file and getting another doesn't produce the same -= as the just deleted file. Also checks the file size is 0. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt deleted file mode 100644 index 8db09123210..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetTempFileNameW.cpp -) - -add_executable(paltest_gettempfilenamew_test1 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamew_test1 coreclrpal) - -target_link_libraries(paltest_gettempfilenamew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp index 126b3f63685..0d6371cd859 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp @@ -14,7 +14,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameW_test1_paltest_gettempfilenamew_test1, "file_io/GetTempFileNameW/test1/paltest_gettempfilenamew_test1") { UINT uiError = 0; const UINT uUnique = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/testinfo.dat deleted file mode 100644 index b315f7aef6b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameW -Name = Test for GetTempFileNameW (test 1) -Type = DEFAULT -EXE1 = gettempfilenamew -Description -= Test all the different options of GetTempFileNameW - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt deleted file mode 100644 index 2181841f380..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetTempFileNameW.cpp -) - -add_executable(paltest_gettempfilenamew_test2 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamew_test2 coreclrpal) - -target_link_libraries(paltest_gettempfilenamew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp index d649bf811fc..d79e4cad67f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp @@ -14,7 +14,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameW_test2_paltest_gettempfilenamew_test2, "file_io/GetTempFileNameW/test2/paltest_gettempfilenamew_test2") { UINT uiError = 0; DWORD dwError = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/testinfo.dat deleted file mode 100644 index 74d871676d4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameW -Name = Test for GetTempFileNameW (test 2) -Type = DEFAULT -EXE1 = gettempfilenamew -Description -= This test attempts to create over 65000 files and will -= have to be run manually because it will take longer than -= the maximum 60 seconds allowed per test - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt deleted file mode 100644 index 469af9da4c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - gettempfilenamew.cpp -) - -add_executable(paltest_gettempfilenamew_test3 - ${SOURCES} -) - -add_dependencies(paltest_gettempfilenamew_test3 coreclrpal) - -target_link_libraries(paltest_gettempfilenamew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp index 0e55cd0ce22..312138b08e4 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp @@ -24,7 +24,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempFileNameW_test3_paltest_gettempfilenamew_test3, "file_io/GetTempFileNameW/test3/paltest_gettempfilenamew_test3") { const UINT uUnique = 0; UINT uiError; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/testinfo.dat deleted file mode 100644 index 176994bab29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempFileNameW -Name = Test for GetTempFileNameW (test 3) -Type = DEFAULT -EXE1 = gettempfilenamew -Description -= Tests the PAL implementation of the GetTempFileNameW function. -= Checks the file attributes and ensures that getting a file name, -= deleting the file and getting another doesn't produce the same -= as the just deleted file. Also checks the file size is 0. diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt deleted file mode 100644 index 690eead144f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetTempPathW.cpp -) - -add_executable(paltest_gettemppathw_test1 - ${SOURCES} -) - -add_dependencies(paltest_gettemppathw_test1 coreclrpal) - -target_link_libraries(paltest_gettemppathw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp index a33eee5008a..6c54612344f 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp @@ -62,7 +62,7 @@ static void SetAndCheckLength(const WCHAR tmpDirPath [], int bufferLength, int e } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_GetTempPathW_test1_paltest_gettemppathw_test1, "file_io/GetTempPathW/test1/paltest_gettemppathw_test1") { if (0 != PAL_Initialize(argc, argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/testinfo.dat deleted file mode 100644 index bcca83dc2c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/GetTempPathW/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempPathW -Name = Test for GetTempPathW (test 1) -Type = DEFAULT -EXE1 = gettemppathw -Description -= Calls GetTempPathW and verifies by passing the returned -= value to CreateDirectoryW. If the returned path exists, -= CreateDirectoryW will fail. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt deleted file mode 100644 index 3582b9520f5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - MoveFileExA.cpp -) - -add_executable(paltest_movefileexa_test1 - ${SOURCES} -) - -add_dependencies(paltest_movefileexa_test1 coreclrpal) - -target_link_libraries(paltest_movefileexa_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp index ca0b80035bc..26df141d997 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp @@ -13,20 +13,20 @@ #include <palsuite.h> -LPSTR lpSource[4] = { +LPSTR lpSource_MoveFileExA_test1[4] = { "src_existing.tmp", "src_non-existant.tmp", "src_dir_existing", "src_dir_non-existant" }; -LPSTR lpDestination[4]={ +LPSTR lpDestination_MoveFileExA_test1[4]={ "dst_existing.tmp", "dst_non-existant.tmp", "dst_dir_existing", "dst_dir_non-existant" }; -LPSTR lpFiles[14] ={ +LPSTR lpFiles_MoveFileExA_test1[14] ={ "src_dir_existing\\test01.tmp", "src_dir_existing\\test02.tmp", "dst_dir_existing\\test01.tmp", @@ -43,37 +43,37 @@ LPSTR lpFiles[14] ={ "dst_dir_non-existant\\test02.tmp" }; -DWORD dwFlag[2] = {MOVEFILE_COPY_ALLOWED, MOVEFILE_REPLACE_EXISTING}; +DWORD dwFlag_MoveFileExA_test1[2] = {MOVEFILE_COPY_ALLOWED, MOVEFILE_REPLACE_EXISTING}; -int createExisting(void) +int createExisting_MoveFileExA_test1(void) { HANDLE tempFile = NULL; HANDLE tempFile2 = NULL; /* create the src_existing file and dst_existing file */ - tempFile = CreateFileA(lpSource[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile = CreateFileA(lpSource_MoveFileExA_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileA(lpDestination[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileA(lpDestination_MoveFileExA_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); if ((tempFile == NULL) || (tempFile2 == NULL)) { - Trace("ERROR[%ul]: couldn't create %S or %S\n", GetLastError(), lpSource[0], - lpDestination[0]); + Trace("ERROR[%ul]: couldn't create %S or %S\n", GetLastError(), lpSource_MoveFileExA_test1[0], + lpDestination_MoveFileExA_test1[0]); return FAIL; } /* create the src_dir_existing and dst_dir_existing directory and files */ - CreateDirectoryA(lpSource[2], NULL); + CreateDirectoryA(lpSource_MoveFileExA_test1[2], NULL); - tempFile = CreateFileA(lpFiles[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile = CreateFileA(lpFiles_MoveFileExA_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileA(lpFiles[1], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileA(lpFiles_MoveFileExA_test1[1], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); @@ -84,10 +84,10 @@ int createExisting(void) return FAIL; } - CreateDirectoryA(lpDestination[2], NULL); - tempFile = CreateFileA(lpFiles[2], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + CreateDirectoryA(lpDestination_MoveFileExA_test1[2], NULL); + tempFile = CreateFileA(lpFiles_MoveFileExA_test1[2], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileA(lpFiles[3], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileA(lpFiles_MoveFileExA_test1[3], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); @@ -101,7 +101,7 @@ int createExisting(void) } -void removeDirectoryHelper(LPSTR dir, int location) +void removeDirectoryHelper_MoveFileExA_test1(LPSTR dir, int location) { DWORD dwAtt = GetFileAttributesA(dir); @@ -119,7 +119,7 @@ void removeDirectoryHelper(LPSTR dir, int location) } } -void removeFileHelper(LPSTR pfile, int location) +void removeFileHelper_MoveFileExA_test1(LPSTR pfile, int location) { FILE *fp; fp = fopen( pfile, "r"); @@ -139,72 +139,72 @@ void removeFileHelper(LPSTR pfile, int location) } -void removeAll(void) +void removeAll_MoveFileExA_test1(void) { DWORD dwAtt; /* get rid of destination dirs and files */ - removeFileHelper(lpSource[0], 11); - removeFileHelper(lpSource[1], 12); - removeFileHelper(lpFiles[0], 13); - removeFileHelper(lpFiles[1], 14); + removeFileHelper_MoveFileExA_test1(lpSource_MoveFileExA_test1[0], 11); + removeFileHelper_MoveFileExA_test1(lpSource_MoveFileExA_test1[1], 12); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[0], 13); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[1], 14); - removeDirectoryHelper(lpSource[2], 101); - removeFileHelper(lpFiles[4], 15); - removeFileHelper(lpFiles[5], 16); - removeDirectoryHelper(lpSource[3], 102); + removeDirectoryHelper_MoveFileExA_test1(lpSource_MoveFileExA_test1[2], 101); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[4], 15); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[5], 16); + removeDirectoryHelper_MoveFileExA_test1(lpSource_MoveFileExA_test1[3], 102); /* get rid of destination dirs and files */ - dwAtt = GetFileAttributesA(lpDestination[0]); + dwAtt = GetFileAttributesA(lpDestination_MoveFileExA_test1[0]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[6], 18); - removeFileHelper(lpFiles[7], 19); - removeDirectoryHelper(lpDestination[0], 103); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[6], 18); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[7], 19); + removeDirectoryHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[0], 103); } else { - removeFileHelper(lpDestination[0], 17); + removeFileHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[0], 17); } - dwAtt = GetFileAttributesA(lpDestination[1]); + dwAtt = GetFileAttributesA(lpDestination_MoveFileExA_test1[1]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[8], 21); - removeFileHelper(lpFiles[9], 22); - removeDirectoryHelper(lpDestination[1], 104); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[8], 21); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[9], 22); + removeDirectoryHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[1], 104); } else { - removeFileHelper(lpDestination[1], 19); + removeFileHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[1], 19); } - dwAtt = GetFileAttributesA(lpDestination[2]); + dwAtt = GetFileAttributesA(lpDestination_MoveFileExA_test1[2]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[10], 24); - removeFileHelper(lpFiles[11], 25); - removeDirectoryHelper(lpDestination[2], 105); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[10], 24); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[11], 25); + removeDirectoryHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[2], 105); } else { - removeFileHelper(lpDestination[2], 23); + removeFileHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[2], 23); } - dwAtt = GetFileAttributesA(lpDestination[3]); + dwAtt = GetFileAttributesA(lpDestination_MoveFileExA_test1[3]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[12], 26); - removeFileHelper(lpFiles[13], 27); - removeDirectoryHelper(lpDestination[3], 106); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[12], 26); + removeFileHelper_MoveFileExA_test1(lpFiles_MoveFileExA_test1[13], 27); + removeDirectoryHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[3], 106); } else { - removeFileHelper(lpDestination[3], 107); + removeFileHelper_MoveFileExA_test1(lpDestination_MoveFileExA_test1[3], 107); } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_MoveFileExA_test1_paltest_movefileexa_test1, "file_io/MoveFileExA/test1/paltest_movefileexa_test1") { BOOL bRc = TRUE; char results[40]; @@ -237,24 +237,24 @@ int __cdecl main(int argc, char *argv[]) /* clean the slate */ - removeAll(); - if (createExisting() != PASS) + removeAll_MoveFileExA_test1(); + if (createExisting_MoveFileExA_test1() != PASS) { goto EXIT; } - /* lpSource loop */ + /* lpSource_MoveFileExA_test1 loop */ for (i = 0; i < 4; i++) { - /* lpDestination loop */ + /* lpDestination_MoveFileExA_test1 loop */ for (j = 0; j < 4; j++) { - /* dwFlag loop */ + /* dwFlag_MoveFileExA_test1 loop */ for (k = 0; k < 2; k++) { /* move the file to the new location */ - bRc = MoveFileExA(lpSource[i], lpDestination[j], dwFlag[k]); + bRc = MoveFileExA(lpSource_MoveFileExA_test1[i], lpDestination_MoveFileExA_test1[j], dwFlag_MoveFileExA_test1[k]); if (!( ((bRc == TRUE) && (results[nCounter] == '1')) @@ -263,15 +263,15 @@ int __cdecl main(int argc, char *argv[]) ) { Trace("MoveFileExA(%s, %s, %s): Values of i[%d], j[%d], k [%d] and results[%d]=%c LastError[%d]Flag[%d]FAILED\n", - lpSource[i], lpDestination[j], + lpSource_MoveFileExA_test1[i], lpDestination_MoveFileExA_test1[j], k == 1 ? "MOVEFILE_REPLACE_EXISTING":"MOVEFILE_COPY_ALLOWED", i, j, k, nCounter, results[nCounter], GetLastError(), bRc); goto EXIT; } /* undo the last move */ - removeAll(); - if (createExisting() != PASS) + removeAll_MoveFileExA_test1(); + if (createExisting_MoveFileExA_test1() != PASS) { goto EXIT; } @@ -356,7 +356,7 @@ int __cdecl main(int argc, char *argv[]) res = PASS; EXIT: - removeAll(); + removeAll_MoveFileExA_test1(); PAL_TerminateEx(res); return res; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/testinfo.dat deleted file mode 100644 index baf6a864055..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = MoveFileExA -Name = Test for MoveFileExA (test 1) -Type = DEFAULT -EXE1 = movefileexa -Description -= Creates a number of files/directories and attempts to move them. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt deleted file mode 100644 index 4e984e8b1a8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - MoveFileExW.cpp -) - -add_executable(paltest_movefileexw_test1 - ${SOURCES} -) - -add_dependencies(paltest_movefileexw_test1 coreclrpal) - -target_link_libraries(paltest_movefileexw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp index bb9cb5a2d76..70a6e29f126 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp @@ -13,40 +13,40 @@ #include <palsuite.h> -LPWSTR lpSource[4]; -LPWSTR lpDestination[4]; -LPWSTR lpFiles[14]; +LPWSTR lpSource_MoveFileExW_test1[4]; +LPWSTR lpDestination_MoveFileExW_test1[4]; +LPWSTR lpFiles_MoveFileExW_test1[14]; -DWORD dwFlag[2] = {MOVEFILE_COPY_ALLOWED, MOVEFILE_REPLACE_EXISTING}; +DWORD dwFlag_MoveFileExW_test1[2] = {MOVEFILE_COPY_ALLOWED, MOVEFILE_REPLACE_EXISTING}; -int createExisting(void) +int createExisting_MoveFileExW_test1(void) { HANDLE tempFile = NULL; HANDLE tempFile2 = NULL; /* create the src_existing file and dst_existing file */ - tempFile = CreateFileW(lpSource[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile = CreateFileW(lpSource_MoveFileExW_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileW(lpDestination[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileW(lpDestination_MoveFileExW_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); if ((tempFile == NULL) || (tempFile2 == NULL)) { - Trace("ERROR: couldn't create %S or %S\n", lpSource[0], - lpDestination[0]); + Trace("ERROR: couldn't create %S or %S\n", lpSource_MoveFileExW_test1[0], + lpDestination_MoveFileExW_test1[0]); return FAIL; } /* create the src_dir_existing and dst_dir_existing directory and files */ - CreateDirectoryW(lpSource[2], NULL); + CreateDirectoryW(lpSource_MoveFileExW_test1[2], NULL); - tempFile = CreateFileW(lpFiles[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile = CreateFileW(lpFiles_MoveFileExW_test1[0], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileW(lpFiles[1], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileW(lpFiles_MoveFileExW_test1[1], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); @@ -57,10 +57,10 @@ int createExisting(void) return FAIL; } - CreateDirectoryW(lpDestination[2], NULL); - tempFile = CreateFileW(lpFiles[2], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + CreateDirectoryW(lpDestination_MoveFileExW_test1[2], NULL); + tempFile = CreateFileW(lpFiles_MoveFileExW_test1[2], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - tempFile2 = CreateFileW(lpFiles[3], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + tempFile2 = CreateFileW(lpFiles_MoveFileExW_test1[3], GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); CloseHandle(tempFile2); CloseHandle(tempFile); @@ -73,7 +73,7 @@ int createExisting(void) return PASS; } -void removeDirectoryHelper(LPWSTR dir, int location) +void removeDirectoryHelper_MoveFileExW_test1(LPWSTR dir, int location) { DWORD dwAtt = GetFileAttributesW(dir); // Trace(" Value of location[%d], and directorye [%S]\n", location, dir); @@ -87,7 +87,7 @@ void removeDirectoryHelper(LPWSTR dir, int location) } } -void removeFileHelper(LPWSTR wfile, int location) +void removeFileHelper_MoveFileExW_test1(LPWSTR wfile, int location) { FILE *fp; char * pfile = convertC(wfile); @@ -115,108 +115,108 @@ void removeFileHelper(LPWSTR wfile, int location) free(pfile); } -void removeAll(void) +void removeAll_MoveFileExW_test1(void) { DWORD dwAtt; /* get rid of destination dirs and files */ - removeFileHelper(lpSource[0], 11); -// lpSource[0] = convert("src_existing.tmp"); + removeFileHelper_MoveFileExW_test1(lpSource_MoveFileExW_test1[0], 11); +// lpSource_MoveFileExW_test1[0] = convert("src_existing.tmp"); - removeFileHelper(lpSource[1], 12); - //lpSource[1] = convert("src_non-existant.tmp"); + removeFileHelper_MoveFileExW_test1(lpSource_MoveFileExW_test1[1], 12); + //lpSource_MoveFileExW_test1[1] = convert("src_non-existant.tmp"); - removeFileHelper(lpFiles[0], 13); -// lpFiles[0] = convert("src_dir_existing\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[0], 13); +// lpFiles_MoveFileExW_test1[0] = convert("src_dir_existing\\test01.tmp"); - removeFileHelper(lpFiles[1], 14); -// lpFiles[1] = convert("src_dir_existing\\test02.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[1], 14); +// lpFiles_MoveFileExW_test1[1] = convert("src_dir_existing\\test02.tmp"); - removeDirectoryHelper(lpSource[2], 101); -// lpSource[2] = convert("src_dir_existing"); + removeDirectoryHelper_MoveFileExW_test1(lpSource_MoveFileExW_test1[2], 101); +// lpSource_MoveFileExW_test1[2] = convert("src_dir_existing"); - removeFileHelper(lpFiles[4], 15); -// lpFiles[4] = convert("src_dir_non-existant\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[4], 15); +// lpFiles_MoveFileExW_test1[4] = convert("src_dir_non-existant\\test01.tmp"); - removeFileHelper(lpFiles[5], 16); -// lpFiles[5] = convert("src_dir_non-existant\\test02.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[5], 16); +// lpFiles_MoveFileExW_test1[5] = convert("src_dir_non-existant\\test02.tmp"); - removeDirectoryHelper(lpSource[3], 102); -// lpSource[3] = convert("src_dir_non-existant"); + removeDirectoryHelper_MoveFileExW_test1(lpSource_MoveFileExW_test1[3], 102); +// lpSource_MoveFileExW_test1[3] = convert("src_dir_non-existant"); /* get rid of destination dirs and files */ - dwAtt = GetFileAttributesW(lpDestination[0]); + dwAtt = GetFileAttributesW(lpDestination_MoveFileExW_test1[0]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[6], 18); - // lpFiles[6] = convert("dst_existing.tmp\\test01.tmp"); - removeFileHelper(lpFiles[7], 19); - // lpFiles[7] = convert("dst_existing.tmp\\test02.tmp"); - removeDirectoryHelper(lpDestination[0], 103); - // lpDestination[0] = convert("dst_existing.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[6], 18); + // lpFiles_MoveFileExW_test1[6] = convert("dst_existing.tmp\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[7], 19); + // lpFiles_MoveFileExW_test1[7] = convert("dst_existing.tmp\\test02.tmp"); + removeDirectoryHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[0], 103); + // lpDestination_MoveFileExW_test1[0] = convert("dst_existing.tmp"); } else { - removeFileHelper(lpDestination[0], 17); - // lpDestination[0] = convert("dst_existing.tmp"); + removeFileHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[0], 17); + // lpDestination_MoveFileExW_test1[0] = convert("dst_existing.tmp"); } - dwAtt = GetFileAttributesW(lpDestination[1]); + dwAtt = GetFileAttributesW(lpDestination_MoveFileExW_test1[1]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[8], 21); - // lpFiles[8] = convert("dst_non-existant.tmp\\test01.tmp"); - removeFileHelper(lpFiles[9], 22); - // lpFiles[9] = convert("dst_non-existant.tmp\\test02.tmp"); - removeDirectoryHelper(lpDestination[1], 104); - // lpDestination[1] = convert("dst_non-existant.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[8], 21); + // lpFiles_MoveFileExW_test1[8] = convert("dst_non-existant.tmp\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[9], 22); + // lpFiles_MoveFileExW_test1[9] = convert("dst_non-existant.tmp\\test02.tmp"); + removeDirectoryHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[1], 104); + // lpDestination_MoveFileExW_test1[1] = convert("dst_non-existant.tmp"); } else { - removeFileHelper(lpDestination[1], 19); - //lpDestination[1] = convert("dst_non-existant.tmp"); + removeFileHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[1], 19); + //lpDestination_MoveFileExW_test1[1] = convert("dst_non-existant.tmp"); } - dwAtt = GetFileAttributesW(lpDestination[2]); + dwAtt = GetFileAttributesW(lpDestination_MoveFileExW_test1[2]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[10], 24); - // lpFiles[10] = convert("dst_dir_existing\\test01.tmp"); - removeFileHelper(lpFiles[11], 25); - // lpFiles[11] = convert("dst_dir_existing\\test02.tmp"); - removeDirectoryHelper(lpDestination[2], 105); - // lpDestination[2] = convert("dst_dir_existing"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[10], 24); + // lpFiles_MoveFileExW_test1[10] = convert("dst_dir_existing\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[11], 25); + // lpFiles_MoveFileExW_test1[11] = convert("dst_dir_existing\\test02.tmp"); + removeDirectoryHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[2], 105); + // lpDestination_MoveFileExW_test1[2] = convert("dst_dir_existing"); } else { - removeFileHelper(lpDestination[2], 23); - // lpDestination[2] = convert("dst_dir_existing"); + removeFileHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[2], 23); + // lpDestination_MoveFileExW_test1[2] = convert("dst_dir_existing"); } - dwAtt = GetFileAttributesW(lpDestination[3]); + dwAtt = GetFileAttributesW(lpDestination_MoveFileExW_test1[3]); if (( dwAtt != INVALID_FILE_ATTRIBUTES ) && ( dwAtt & FILE_ATTRIBUTE_DIRECTORY) ) { - removeFileHelper(lpFiles[12], 26); - // lpFiles[12] = convert("dst_dir_non-existant\\test01.tmp"); - removeFileHelper(lpFiles[13], 27); - // lpFiles[13] = convert("dst_dir_non-existant\\test02.tmp"); - removeDirectoryHelper(lpDestination[3], 106); - // lpDestination[3] = convert("dst_dir_non-existant"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[12], 26); + // lpFiles_MoveFileExW_test1[12] = convert("dst_dir_non-existant\\test01.tmp"); + removeFileHelper_MoveFileExW_test1(lpFiles_MoveFileExW_test1[13], 27); + // lpFiles_MoveFileExW_test1[13] = convert("dst_dir_non-existant\\test02.tmp"); + removeDirectoryHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[3], 106); + // lpDestination_MoveFileExW_test1[3] = convert("dst_dir_non-existant"); } else { - removeFileHelper(lpDestination[3], 107); - // lpDestination[3] = convert("dst_dir_non-existant"); + removeFileHelper_MoveFileExW_test1(lpDestination_MoveFileExW_test1[3], 107); + // lpDestination_MoveFileExW_test1[3] = convert("dst_dir_non-existant"); } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_MoveFileExW_test1_paltest_movefileexw_test1, "file_io/MoveFileExW/test1/paltest_movefileexw_test1") { BOOL bRc = TRUE; char results[40]; @@ -233,34 +233,34 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - lpSource[0] = convert("src_existing.tmp"); - lpSource[1] = convert("src_non-existant.tmp"); - lpSource[2] = convert("src_dir_existing"); - lpSource[3] = convert("src_dir_non-existant"); + lpSource_MoveFileExW_test1[0] = convert("src_existing.tmp"); + lpSource_MoveFileExW_test1[1] = convert("src_non-existant.tmp"); + lpSource_MoveFileExW_test1[2] = convert("src_dir_existing"); + lpSource_MoveFileExW_test1[3] = convert("src_dir_non-existant"); - lpDestination[0] = convert("dst_existing.tmp"); - lpDestination[1] = convert("dst_non-existant.tmp"); - lpDestination[2] = convert("dst_dir_existing"); - lpDestination[3] = convert("dst_dir_non-existant"); + lpDestination_MoveFileExW_test1[0] = convert("dst_existing.tmp"); + lpDestination_MoveFileExW_test1[1] = convert("dst_non-existant.tmp"); + lpDestination_MoveFileExW_test1[2] = convert("dst_dir_existing"); + lpDestination_MoveFileExW_test1[3] = convert("dst_dir_non-existant"); - lpFiles[0] = convert("src_dir_existing\\test01.tmp"); - lpFiles[1] = convert("src_dir_existing\\test02.tmp"); - lpFiles[2] = convert("dst_dir_existing\\test01.tmp"); - lpFiles[3] = convert("dst_dir_existing\\test02.tmp"); - lpFiles[4] = convert("src_dir_non-existant\\test01.tmp"); - lpFiles[5] = convert("src_dir_non-existant\\test02.tmp"); + lpFiles_MoveFileExW_test1[0] = convert("src_dir_existing\\test01.tmp"); + lpFiles_MoveFileExW_test1[1] = convert("src_dir_existing\\test02.tmp"); + lpFiles_MoveFileExW_test1[2] = convert("dst_dir_existing\\test01.tmp"); + lpFiles_MoveFileExW_test1[3] = convert("dst_dir_existing\\test02.tmp"); + lpFiles_MoveFileExW_test1[4] = convert("src_dir_non-existant\\test01.tmp"); + lpFiles_MoveFileExW_test1[5] = convert("src_dir_non-existant\\test02.tmp"); - lpFiles[6] = convert("dst_existing.tmp\\test01.tmp"); - lpFiles[7] = convert("dst_existing.tmp\\test02.tmp"); + lpFiles_MoveFileExW_test1[6] = convert("dst_existing.tmp\\test01.tmp"); + lpFiles_MoveFileExW_test1[7] = convert("dst_existing.tmp\\test02.tmp"); - lpFiles[8] = convert("dst_non-existant.tmp\\test01.tmp"); - lpFiles[9] = convert("dst_non-existant.tmp\\test02.tmp"); + lpFiles_MoveFileExW_test1[8] = convert("dst_non-existant.tmp\\test01.tmp"); + lpFiles_MoveFileExW_test1[9] = convert("dst_non-existant.tmp\\test02.tmp"); - lpFiles[10] = convert("dst_dir_existing\\test01.tmp"); - lpFiles[11] = convert("dst_dir_existing\\test02.tmp"); + lpFiles_MoveFileExW_test1[10] = convert("dst_dir_existing\\test01.tmp"); + lpFiles_MoveFileExW_test1[11] = convert("dst_dir_existing\\test02.tmp"); - lpFiles[12] = convert("dst_dir_non-existant\\test01.tmp"); - lpFiles[13] = convert("dst_dir_non-existant\\test02.tmp"); + lpFiles_MoveFileExW_test1[12] = convert("dst_dir_non-existant\\test01.tmp"); + lpFiles_MoveFileExW_test1[13] = convert("dst_dir_non-existant\\test02.tmp"); /* read in the expected results to compare with actual results */ memset (results, 0, 34); @@ -283,19 +283,19 @@ int __cdecl main(int argc, char *argv[]) /* clean the slate */ - removeAll(); - if (createExisting() != PASS) + removeAll_MoveFileExW_test1(); + if (createExisting_MoveFileExW_test1() != PASS) { goto EXIT; } - /* lpSource loop */ + /* lpSource_MoveFileExW_test1 loop */ for (i = 0; i < 4; i++) { - /* lpDestination loop */ + /* lpDestination_MoveFileExW_test1 loop */ for (j = 0; j < 4; j++) { - /* dwFlag loop */ + /* dwFlag_MoveFileExW_test1 loop */ for (k = 0; k < 2; k++) { @@ -304,7 +304,7 @@ int __cdecl main(int argc, char *argv[]) //exit(1); //} /* move the file to the new location */ - bRc = MoveFileExW(lpSource[i], lpDestination[j], dwFlag[k]); + bRc = MoveFileExW(lpSource_MoveFileExW_test1[i], lpDestination_MoveFileExW_test1[j], dwFlag_MoveFileExW_test1[k]); if (!( ((bRc == TRUE) && (results[nCounter] == '1')) @@ -313,21 +313,21 @@ int __cdecl main(int argc, char *argv[]) ) { Trace("MoveFileExW(%S, %S, %s): Values of i[%d], j[%d], k [%d] and results[%d]=%c LastError[%d]Flag[%d]FAILED\n", - lpSource[i], lpDestination[j], + lpSource_MoveFileExW_test1[i], lpDestination_MoveFileExW_test1[j], k == 1 ? "MOVEFILE_REPLACE_EXISTING":"MOVEFILE_COPY_ALLOWED", i, j, k, nCounter, results[nCounter], GetLastError(), bRc); goto EXIT; } //Trace("MoveFileExW(%S, %S, %s): Values of i[%d], j[%d], k [%d] and results[%d]=%c \n", - // lpSource[i], lpDestination[j], + // lpSource_MoveFileExW_test1[i], lpDestination_MoveFileExW_test1[j], // k == 1 ? // "MOVEFILE_REPLACE_EXISTING":"MOVEFILE_COPY_ALLOWED", i, j, k, nCounter, results[nCounter]); /* undo the last move */ - removeAll(); - if (createExisting() != PASS) + removeAll_MoveFileExW_test1(); + if (createExisting_MoveFileExW_test1() != PASS) { goto EXIT; } @@ -413,15 +413,15 @@ int __cdecl main(int argc, char *argv[]) res = PASS; EXIT: - removeAll(); + removeAll_MoveFileExW_test1(); for (i=0; i<4; i++) { - free(lpSource[i]); - free(lpDestination[i]); + free(lpSource_MoveFileExW_test1[i]); + free(lpDestination_MoveFileExW_test1[i]); } for (i=0; i<14; i++) { - free(lpFiles[i]); + free(lpFiles_MoveFileExW_test1[i]); } PAL_TerminateEx(res); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/testinfo.dat deleted file mode 100644 index 6b4a8b2cfbb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/MoveFileExW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = MoveFileExW -Name = Test for MoveFileExW (test 1) -Type = DEFAULT -EXE1 = movefileexw -Description -= Creates a number of files/directories and attempts to move them. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt deleted file mode 100644 index 51a66debad4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ReadFile.cpp -) - -add_executable(paltest_readfile_test1 - ${SOURCES} -) - -add_dependencies(paltest_readfile_test1 coreclrpal) - -target_link_libraries(paltest_readfile_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp index 2c9698d7c6a..822531db4b8 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_ReadFile_test1_paltest_readfile_test1, "file_io/ReadFile/test1/paltest_readfile_test1") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/testinfo.dat deleted file mode 100644 index 7aa03cd48f5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = ReadFile -Name = Positive Test for ReadFile -Type = DEFAULT -EXE1 = readfile -Description -=Attempt to read from a NULL handle and a file without read permissions - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt deleted file mode 100644 index adf226e3149..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ReadFile.cpp -) - -add_executable(paltest_readfile_test2 - ${SOURCES} -) - -add_dependencies(paltest_readfile_test2 coreclrpal) - -target_link_libraries(paltest_readfile_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp index 3f969eb4b6d..96962eda398 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp @@ -21,19 +21,18 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back.\0"; -const char* szEmptyString = ""; -const char* szReadableFile = "Readable.txt"; -const char* szResultsFile = "Results.txt"; +#define szStringTest "The quick fox jumped over the lazy dog's back.\0" +#define szEmptyString "" +#define szReadableFile "Readable.txt" +#define szResultsFile "Results.txt" //Previously number of tests was 6, now 4 refer VSW 312690 #define NOOFTESTS 4 const int PAGESIZE = 4096; +char *readBuffer_ReadFile_test2; -char *readBuffer; - -BOOL validateResults(const char* szString, // string read +BOOL validateResults_ReadFile_test2(const char* szString, // string read DWORD dwByteCount, // amount requested DWORD dwBytesRead) // amount read { @@ -62,7 +61,7 @@ BOOL validateResults(const char* szString, // string read return TRUE; } -BOOL readTest(DWORD dwByteCount, char cResult) +BOOL readTest_ReadFile_test2(DWORD dwByteCount, char cResult) { HANDLE hFile = NULL; DWORD dwBytesRead; @@ -83,9 +82,9 @@ BOOL readTest(DWORD dwByteCount, char cResult) return FALSE; } - memset(readBuffer, 0, PAGESIZE); + memset(readBuffer_ReadFile_test2, 0, PAGESIZE); - bRc = ReadFile(hFile, readBuffer, dwByteCount, &dwBytesRead, NULL); + bRc = ReadFile(hFile, readBuffer_ReadFile_test2, dwByteCount, &dwBytesRead, NULL); if (bRc == FALSE) { @@ -93,7 +92,7 @@ BOOL readTest(DWORD dwByteCount, char cResult) if (cResult == '1') { Trace("\nbRc = %d\n", bRc); - Trace("readBuffer = [%s] dwByteCount = %d dwBytesRead = %d\n", readBuffer, dwByteCount, dwBytesRead); + Trace("readBuffer = [%s] dwByteCount = %d dwBytesRead = %d\n", readBuffer_ReadFile_test2, dwByteCount, dwBytesRead); Trace("cresult = 1\n"); Trace("getlasterror = %d\n", GetLastError()); CloseHandle(hFile); @@ -111,7 +110,7 @@ BOOL readTest(DWORD dwByteCount, char cResult) } else { - return (validateResults(readBuffer, dwByteCount, dwBytesRead)); + return (validateResults_ReadFile_test2(readBuffer_ReadFile_test2, dwByteCount, dwBytesRead)); } } @@ -119,7 +118,7 @@ BOOL readTest(DWORD dwByteCount, char cResult) return TRUE; } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_ReadFile_test2_paltest_readfile_test2, "file_io/ReadFile/test2/paltest_readfile_test2") { HANDLE hFile = NULL; const int BUFFER_SIZE = 2 * PAGESIZE; @@ -145,14 +144,14 @@ int __cdecl main(int argc, char *argv[]) } /* allocate read-write memery for readBuffer */ - if (!(readBuffer = (char*) VirtualAlloc(NULL, BUFFER_SIZE, MEM_COMMIT, PAGE_READWRITE))) + if (!(readBuffer_ReadFile_test2 = (char*) VirtualAlloc(NULL, BUFFER_SIZE, MEM_COMMIT, PAGE_READWRITE))) { Fail("VirtualAlloc failed: GetLastError returns %d\n", GetLastError()); return FAIL; } /* write protect the second page of readBuffer */ - if (!VirtualProtect(&readBuffer[PAGESIZE], PAGESIZE, PAGE_NOACCESS, &oldProt)) + if (!VirtualProtect(&readBuffer_ReadFile_test2[PAGESIZE], PAGESIZE, PAGE_NOACCESS, &oldProt)) { Fail("VirtualProtect failed: GetLastError returns %d\n", GetLastError()); return FAIL; @@ -179,14 +178,14 @@ int __cdecl main(int argc, char *argv[]) for (i = 0; i< NOOFTESTS; i++) { - bRc = readTest(dwByteCount[i], szResults[i]); + bRc = readTest_ReadFile_test2(dwByteCount[i], szResults[i]); if (bRc != TRUE) { Fail("ReadFile: ERROR -> Failed on test[%d]\n", i); } } - VirtualFree(readBuffer, BUFFER_SIZE, MEM_RELEASE); + VirtualFree(readBuffer_ReadFile_test2, BUFFER_SIZE, MEM_RELEASE); PAL_Terminate(); return PASS; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/testinfo.dat deleted file mode 100644 index 510f79fca6c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = ReadFile -Name = Positive Test for ReadFile -Type = DEFAULT -EXE1 = readfile -Description -=Multiple tests of reads of varying sizes with verification - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt deleted file mode 100644 index 2ce27e0dac2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ReadFile.cpp -) - -add_executable(paltest_readfile_test3 - ${SOURCES} -) - -add_dependencies(paltest_readfile_test3 coreclrpal) - -target_link_libraries(paltest_readfile_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp index 937e581c11a..e9762552d90 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp @@ -23,13 +23,13 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back.\0"; -const char* szEmptyString = ""; -const char* szReadableFile = "Readable.txt"; -const char* szResultsFile = "Results.txt"; +#define szStringTest "The quick fox jumped over the lazy dog's back.\0" +#define szEmptyString "" +#define szReadableFile "Readable.txt" +#define szResultsFile "Results.txt" -BOOL validateResults(const char* szString, // string read +BOOL validateResults_ReadFile_test3(const char* szString, // string read DWORD dwByteCount, // amount requested DWORD dwBytesRead) // amount read { @@ -62,7 +62,7 @@ BOOL validateResults(const char* szString, // string read -BOOL readTest(DWORD dwByteCount, char cResult) +BOOL readTest_ReadFile_test3(DWORD dwByteCount, char cResult) { HANDLE hFile = NULL; DWORD dwBytesRead = 0; @@ -125,7 +125,7 @@ BOOL readTest(DWORD dwByteCount, char cResult) } else { - return (validateResults(szString, dwRequested, dwTotal)); + return (validateResults_ReadFile_test3(szString, dwRequested, dwTotal)); } } @@ -135,7 +135,7 @@ BOOL readTest(DWORD dwByteCount, char cResult) -int __cdecl main(int argc, char **argv) +PALTEST(file_io_ReadFile_test3_paltest_readfile_test3, "file_io/ReadFile/test3/paltest_readfile_test3") { HANDLE hFile = NULL; DWORD dwByteCount[4] = {0, 1, 2, 3}; @@ -171,7 +171,7 @@ int __cdecl main(int argc, char **argv) for (i = 0; i < 4; i++) { - bRc = readTest(dwByteCount[i], szResults[i]); + bRc = readTest_ReadFile_test3(dwByteCount[i], szResults[i]); if (bRc != TRUE) { Fail("ReadFile: ERROR -> Failed on test[%d]\n", i); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/testinfo.dat deleted file mode 100644 index 510f79fca6c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = ReadFile -Name = Positive Test for ReadFile -Type = DEFAULT -EXE1 = readfile -Description -=Multiple tests of reads of varying sizes with verification - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt deleted file mode 100644 index b284c5b77d7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - readfile.cpp -) - -add_executable(paltest_readfile_test4 - ${SOURCES} -) - -add_dependencies(paltest_readfile_test4 coreclrpal) - -target_link_libraries(paltest_readfile_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp index 864695092a6..1704c4c2e9d 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp @@ -15,7 +15,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_ReadFile_test4_paltest_readfile_test4, "file_io/ReadFile/test4/paltest_readfile_test4") { HANDLE hFile = NULL; DWORD dwBytesWritten; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/testinfo.dat deleted file mode 100644 index 664ce3362f6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/ReadFile/test4/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = ReadFile -Name = Positive Test for ReadFile -Type = DEFAULT -EXE1 = readfile -Description -= Tests the PAL implementation of the ReadFile function. -= Creates a file and writes a small string to it, attempt -= to read many more characters that exist. The returned -= number of chars should be the amount written originally -= not the number requested. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/RemoveDirectoryW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt deleted file mode 100644 index 86201dd8d66..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SearchPathW.cpp -) - -add_executable(paltest_searchpathw_test1 - ${SOURCES} -) - -add_dependencies(paltest_searchpathw_test1 coreclrpal) - -target_link_libraries(paltest_searchpathw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp index c6cc79f984c..aa9e3bee6ba 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp @@ -57,19 +57,19 @@ #include <palsuite.h> -const char* szDir = "."; +#define szDir "." -const char* szNoFileName = "333asdf"; -const char* szNoFileNameExt = ".x77t"; +#define szNoFileName "333asdf" +#define szNoFileNameExt ".x77t" -const char* szFileNameExists = "searchpathw"; -const char* szFileNameExtExists = ".c"; +#define szFileNameExists "searchpathw" +#define szFileNameExtExists ".c" -const char* szFileNameExistsWithExt = "searchpathw.c"; +#define szFileNameExistsWithExt "searchpathw.c" -char fileloc[_MAX_PATH]; +char fileloc_SearchPathW_test1[_MAX_PATH]; -void removeFileHelper(LPSTR pfile, int location) +void removeFileHelper_SearchPathW_test1(LPSTR pfile, int location) { FILE *fp; fp = fopen( pfile, "r"); @@ -93,12 +93,13 @@ void removeFileHelper(LPSTR pfile, int location) } -void RemoveAll() +void RemoveAll_SearchPathW_test1() { - removeFileHelper(fileloc, 1); + removeFileHelper_SearchPathW_test1(fileloc_SearchPathW_test1, 1); } -int __cdecl main(int argc, char *argv[]) { +PALTEST(file_io_SearchPathW_test1_paltest_searchpathw_test1, "file_io/SearchPathW/test1/paltest_searchpathw_test1") +{ WCHAR* lpPath = NULL; WCHAR* lpFileName = NULL; @@ -131,17 +132,17 @@ int __cdecl main(int argc, char *argv[]) { Fail("ERROR: GetTempPathA failed to get a path\n"); } - memset(fileloc, 0, _MAX_PATH); - sprintf_s(fileloc, _countof(fileloc), "%s%s", fullPath, szFileNameExistsWithExt); + memset(fileloc_SearchPathW_test1, 0, _MAX_PATH); + sprintf_s(fileloc_SearchPathW_test1, _countof(fileloc_SearchPathW_test1), "%s%s", fullPath, szFileNameExistsWithExt); - RemoveAll(); + RemoveAll_SearchPathW_test1(); - hsearchfile = CreateFileA(fileloc, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, + hsearchfile = CreateFileA(fileloc_SearchPathW_test1, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); if (hsearchfile == NULL) { - Trace("ERROR[%ul]: couldn't create %s\n", GetLastError(), fileloc); + Trace("ERROR[%ul]: couldn't create %s\n", GetLastError(), fileloc_SearchPathW_test1); return FAIL; } @@ -185,7 +186,7 @@ int __cdecl main(int argc, char *argv[]) { free(lpPath); free(lpFileName); - RemoveAll(); + RemoveAll_SearchPathW_test1(); PAL_Terminate(); return PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/testinfo.dat deleted file mode 100644 index 1664a75d527..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SearchPathW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SearchPathW -Name = Test #1 for SearchPathW -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests the PAL implementation of the SearchFileW function diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/CMakeLists.txt deleted file mode 100644 index dcf480bf226..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt deleted file mode 100644 index 675371750b4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetEndOfFile.cpp -) - -add_executable(paltest_setendoffile_test1 - ${SOURCES} -) - -add_dependencies(paltest_setendoffile_test1 coreclrpal) - -target_link_libraries(paltest_setendoffile_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp index b4ca15527e0..56bcbcfce69 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp @@ -20,10 +20,10 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetEndOfFile_test1_paltest_setendoffile_test1, "file_io/SetEndOfFile/test1/paltest_setendoffile_test1") { HANDLE hFile = NULL; BOOL bRc = FALSE; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/testinfo.dat deleted file mode 100644 index d3e27707eeb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetEndOfFile -Name = Positive Test for SetEndOfFile -Type = DEFAULT -EXE1 = setendoffile -Description -=Truncate a file - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt deleted file mode 100644 index 324e24eeba4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetEndOfFile.cpp -) - -add_executable(paltest_setendoffile_test2 - ${SOURCES} -) - -add_dependencies(paltest_setendoffile_test2 coreclrpal) - -target_link_libraries(paltest_setendoffile_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp index 031c7573b3a..b3b5372ec64 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp @@ -14,11 +14,9 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back."; -const char* szTextFile = "text.txt"; +#define szStringTest "The quick fox jumped over the lazy dog's back." - -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_SetEndOfFile_test2_paltest_setendoffile_test2, "file_io/SetEndOfFile/test2/paltest_setendoffile_test2") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/testinfo.dat deleted file mode 100644 index 1debf06544c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetEndOfFile -Name = Positive Test for SetEndOfFile -Type = DEFAULT -EXE1 = setendoffile -Description -=Truncate the test file using SetEndOfFile diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt deleted file mode 100644 index e9cb6036a83..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetEndOfFile.cpp -) - -add_executable(paltest_setendoffile_test3 - ${SOURCES} -) - -add_dependencies(paltest_setendoffile_test3 coreclrpal) - -target_link_libraries(paltest_setendoffile_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp index c7598d32b7f..3d30a6a39ac 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetEndOfFile_test3_paltest_setendoffile_test3, "file_io/SetEndOfFile/test3/paltest_setendoffile_test3") { HANDLE hFile = NULL; DWORD dwByteCount = 0; @@ -59,7 +59,7 @@ int __cdecl main(int argc, char *argv[]) Trace("SetEndOfFile: ERROR -> Unable to close file \"%s\".\n", szTextFile); } - PAL_Terminate(); + PAL_TerminateEx(FAIL); return FAIL; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/testinfo.dat deleted file mode 100644 index c6156af4ff9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetEndOfFile -Name = Positive Test for SetEndOfFile -Type = DEFAULT -EXE1 = setendoffile -Description -=Set the end of file past the actual end -=of file thereby, extending it. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt deleted file mode 100644 index 439d184f97d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - setendoffile.cpp -) - -add_executable(paltest_setendoffile_test4 - ${SOURCES} -) - -add_dependencies(paltest_setendoffile_test4 coreclrpal) - -target_link_libraries(paltest_setendoffile_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp index 66530513f9d..f4da80135d2 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp @@ -16,8 +16,8 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back."; -const char* szTextFile = "test.tmp"; +#define szStringTest "The quick fox jumped over the lazy dog's back." +#define szTextFile "test.tmp" static void Cleanup(HANDLE hFile) { @@ -89,7 +89,7 @@ static void DoTest(HANDLE hFile, DWORD dwOffset, DWORD dwMethod) } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_SetEndOfFile_test4_paltest_setendoffile_test4, "file_io/SetEndOfFile/test4/paltest_setendoffile_test4") { HANDLE hFile = NULL; DWORD dwBytesWritten; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/testinfo.dat deleted file mode 100644 index 74236b5df6a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetEndOfFile -Name = Positive Test for SetEndOfFile (test 4) -Type = DEFAULT -EXE1 = setendoffile -Description -= Tests the PAL implementation of the SetEndOfFile function. -= Verify that the file pointer is the same before -= and after a SetEndOfFile using SetFilePointer with -= FILE_BEGIN, FILE_CURRENT and FILE_END diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt deleted file mode 100644 index d329a7f60fb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_setendoffile_test5 - ${SOURCES} -) - -add_dependencies(paltest_setendoffile_test5 coreclrpal) - -target_link_libraries(paltest_setendoffile_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp index f7c6e3c1041..8af9bccc798 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_SetEndOfFile_test5_paltest_setendoffile_test5, "file_io/SetEndOfFile/test5/paltest_setendoffile_test5") { HANDLE hFile = NULL; DWORD dwBytesWritten; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/testinfo.dat deleted file mode 100644 index 169561ae31e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetEndOfFile -Name = Positive Test for SetEndOfFile -Type = DEFAULT -EXE1 = test5 -Description -= Tests the PAL implementation of the SetEndOfFile function. -= Test attempts to set the end of file pointer to a position -= which has data before and after it. Then it attempts to -= read text beyond the end of file pointer. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/CMakeLists.txt deleted file mode 100644 index 7cd88f8e86d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt deleted file mode 100644 index 698768d6ec2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test1 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test1 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp index 6c421bf7e93..b19f174d57d 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test1_paltest_setfilepointer_test1, "file_io/SetFilePointer/test1/paltest_setfilepointer_test1") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/testinfo.dat deleted file mode 100644 index 769fe0173d0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Test for SetFilePointer (test 1) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Set the file pointer on a NULL file handle and other invalid options - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt deleted file mode 100644 index fa25357ec18..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test2 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test2 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp index 073703e644e..1167f229c4c 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp @@ -24,10 +24,10 @@ const char * const szText = "The quick brown fox jumped over the lazy dog's back."; -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test2_paltest_setfilepointer_test2, "file_io/SetFilePointer/test2/paltest_setfilepointer_test2") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/testinfo.dat deleted file mode 100644 index 5e328c6565c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 2) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_BEGIN option - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt deleted file mode 100644 index cf0b9ddec64..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test3 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test3 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp index 1ba13e52531..8c230996322 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp @@ -24,10 +24,10 @@ const char* const szText = "The quick brown fox jumped over the lazy dog's back."; -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test3_paltest_setfilepointer_test3, "file_io/SetFilePointer/test3/paltest_setfilepointer_test3") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/testinfo.dat deleted file mode 100644 index 934aad656f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 3) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_CURRENT option - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt deleted file mode 100644 index 35c0ee9f0e2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test4 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test4 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp index 12e13ca6208..9294886be11 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp @@ -23,10 +23,10 @@ #include <palsuite.h> const char* szText = "The quick brown fox jumped over the lazy dog's back."; -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test4_paltest_setfilepointer_test4, "file_io/SetFilePointer/test4/paltest_setfilepointer_test4") { HANDLE hFile = NULL; DWORD dwByteCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/testinfo.dat deleted file mode 100644 index 0195673da77..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 4) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_END option - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt deleted file mode 100644 index a384a1488c8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test5 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test5 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp index c1c531d1971..d2f8911b4b5 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp @@ -22,9 +22,9 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test5_paltest_setfilepointer_test5, "file_io/SetFilePointer/test5/paltest_setfilepointer_test5") { HANDLE hFile = NULL; DWORD dwOffset = 1; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/testinfo.dat deleted file mode 100644 index baed91d6b76..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 5) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_BEGIN option with the high word parameter. -=This test requires about 4 gig free disk space - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt deleted file mode 100644 index b7b8dbae2aa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test6 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test6 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp index 5b48da950b9..69fe23373fd 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp @@ -22,10 +22,10 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test6_paltest_setfilepointer_test6, "file_io/SetFilePointer/test6/paltest_setfilepointer_test6") { HANDLE hFile = NULL; DWORD dwOffset = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/testinfo.dat deleted file mode 100644 index 1f292b886f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 6) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_CURRENT option with the high word parameter. -=This test requires about 4 GB free disk space. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt deleted file mode 100644 index 6596afadbf2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SetFilePointer.cpp -) - -add_executable(paltest_setfilepointer_test7 - ${SOURCES} -) - -add_dependencies(paltest_setfilepointer_test7 coreclrpal) - -target_link_libraries(paltest_setfilepointer_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp index d7d4d37b621..3230a215f73 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp @@ -22,10 +22,10 @@ #include <palsuite.h> -const char* szTextFile = "text.txt"; -int __cdecl main(int argc, char *argv[]) + +PALTEST(file_io_SetFilePointer_test7_paltest_setfilepointer_test7, "file_io/SetFilePointer/test7/paltest_setfilepointer_test7") { HANDLE hFile = NULL; DWORD dwOffset = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/testinfo.dat deleted file mode 100644 index 1a9b5fb2b67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/SetFilePointer/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = SetFilePointer -Name = Positive Test for SetFilePointer (test 7) -Type = DEFAULT -EXE1 = setfilepointer -Description -=Tests the FILE_END option with the high word parameter -=This test requires about 4 GB of free disk space. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/CMakeLists.txt deleted file mode 100644 index dcf480bf226..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt deleted file mode 100644 index 4a02596986a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WriteFile.cpp -) - -add_executable(paltest_writefile_test1 - ${SOURCES} -) - -add_dependencies(paltest_writefile_test1 coreclrpal) - -target_link_libraries(paltest_writefile_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp index cc805ccf9ff..8664c9e0c98 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp @@ -15,9 +15,10 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back."; -const char* szReadOnlyFile = "ReadOnly.txt"; -void do_cleanup() +#define szStringTest "The quick fox jumped over the lazy dog's back." +#define szReadOnlyFile "ReadOnly.txt" + +void do_cleanup_WriteFile_test1() { BOOL bRc = FALSE; bRc = DeleteFileA(szReadOnlyFile); @@ -29,7 +30,7 @@ void do_cleanup() } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_WriteFile_test1_paltest_writefile_test1, "file_io/WriteFile/test1/paltest_writefile_test1") { HANDLE hFile = NULL; DWORD dwBytesWritten; @@ -78,7 +79,7 @@ int __cdecl main(int argc, char *argv[]) { last_error = GetLastError(); Trace("WriteFile: ERROR[%ld] -> Unable to make the file read-only.\n", last_error); - do_cleanup(); + do_cleanup_WriteFile_test1(); Fail("WriteFile: ERROR[%ld] -> Unable to make the file read-only.\n", last_error); } @@ -86,7 +87,7 @@ int __cdecl main(int argc, char *argv[]) if (bRc == TRUE) { last_error = GetLastError(); Trace("WriteFile: ERROR[%ld] -> Able to write to a read-only file.\n", last_error); - do_cleanup(); + do_cleanup_WriteFile_test1(); Fail("WriteFile: ERROR[%ld] -> Able to write to a read-only file.\n", last_error); } @@ -95,7 +96,7 @@ int __cdecl main(int argc, char *argv[]) if (bRc != TRUE) { last_error = GetLastError(); Trace("WriteFile: ERROR[%ld] -> Unable to close file \"%s\".\n", last_error, szReadOnlyFile); - do_cleanup(); + do_cleanup_WriteFile_test1(); Fail("WriteFile: ERROR -> Unable to close file \"%s\".\n", szReadOnlyFile); } @@ -107,7 +108,7 @@ int __cdecl main(int argc, char *argv[]) Fail("WriteFile: ERROR[%ld] -> Unable to make the file attribute NORMAL.\n", last_error); } - do_cleanup(); + do_cleanup_WriteFile_test1(); PAL_Terminate(); return PASS; } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/testinfo.dat deleted file mode 100644 index 72ec21f55ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = WriteFile -Name = test for WriteFile -Type = DEFAULT -EXE1 = writefile -Description -=Attempt to write to a NULL handle and to a read-only file - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt deleted file mode 100644 index 844c0b19620..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WriteFile.cpp -) - -add_executable(paltest_writefile_test2 - ${SOURCES} -) - -add_dependencies(paltest_writefile_test2 coreclrpal) - -target_link_libraries(paltest_writefile_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp index 593b1667fd5..463e6744b44 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp @@ -16,12 +16,12 @@ #include <palsuite.h> -char* writeBuffer; -const char* szWritableFile = "Writeable.txt"; -const char* szResultsFile = "Results.txt"; +char* writeBuffer_WriteFile_test2; +#define szWritableFile "Writeable.txt" +#define szResultsFile "Results.txt" const int PAGESIZE = 4096; -BOOL writeTest(DWORD dwByteCount, DWORD dwBytesWrittenResult, BOOL bResult) +BOOL writeTest_WriteFile_test2(DWORD dwByteCount, DWORD dwBytesWrittenResult, BOOL bResult) { HANDLE hFile = NULL; DWORD dwBytesWritten; @@ -39,7 +39,7 @@ BOOL writeTest(DWORD dwByteCount, DWORD dwBytesWrittenResult, BOOL bResult) return FALSE; } - bRc = WriteFile(hFile, writeBuffer, dwByteCount, &dwBytesWritten, NULL); + bRc = WriteFile(hFile, writeBuffer_WriteFile_test2, dwByteCount, &dwBytesWritten, NULL); CloseHandle(hFile); if ((bRc != bResult) || (dwBytesWrittenResult != dwBytesWritten)) @@ -53,7 +53,7 @@ BOOL writeTest(DWORD dwByteCount, DWORD dwBytesWrittenResult, BOOL bResult) return TRUE; } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_WriteFile_test2_paltest_writefile_test2, "file_io/WriteFile/test2/paltest_writefile_test2") { const char * testString = "The quick fox jumped over the lazy dog's back."; const int testStringLen = strlen(testString); @@ -72,19 +72,19 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - /* allocate read-write memery for writeBuffer */ - if (!(writeBuffer = (char*) VirtualAlloc(NULL, BUFFER_SIZE, MEM_COMMIT, + /* allocate read-write memery for writeBuffer_WriteFile_test2 */ + if (!(writeBuffer_WriteFile_test2 = (char*) VirtualAlloc(NULL, BUFFER_SIZE, MEM_COMMIT, PAGE_READWRITE))) { Fail("VirtualAlloc failed: GetLastError returns %d\n", GetLastError()); return FAIL; } - memset((void*) writeBuffer, '.', BUFFER_SIZE); - strcpy(writeBuffer, testString); + memset((void*) writeBuffer_WriteFile_test2, '.', BUFFER_SIZE); + strcpy(writeBuffer_WriteFile_test2, testString); - /* write protect the second page of writeBuffer */ - if (!VirtualProtect(&writeBuffer[PAGESIZE], PAGESIZE, PAGE_NOACCESS, &oldProt)) + /* write protect the second page of writeBuffer_WriteFile_test2 */ + if (!VirtualProtect(&writeBuffer_WriteFile_test2[PAGESIZE], PAGESIZE, PAGE_NOACCESS, &oldProt)) { Fail("VirtualProtect failed: GetLastError returns %d\n", GetLastError()); return FAIL; @@ -92,7 +92,7 @@ int __cdecl main(int argc, char *argv[]) for (j = 0; j< 4; j++) { - bRc = writeTest(dwByteCount[j], dwByteWritten[j], bResults[j]); + bRc = writeTest_WriteFile_test2(dwByteCount[j], dwByteWritten[j], bResults[j]); if (bRc != TRUE) { Fail("WriteFile: ERROR -> Failed on test[%d]\n", j); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/testinfo.dat deleted file mode 100644 index 94d2db8b488..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = WriteFile -Name = Positive Test for WriteFile -Type = DEFAULT -EXE1 = writefile -Description -=Multiple tests of writes of varying sizes with verification - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt deleted file mode 100644 index 128d52a67c9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WriteFile.cpp -) - -add_executable(paltest_writefile_test3 - ${SOURCES} -) - -add_dependencies(paltest_writefile_test3 coreclrpal) - -target_link_libraries(paltest_writefile_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp index 672a10e16ec..ec51d5d5c88 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp @@ -15,11 +15,11 @@ #include <palsuite.h> -const char* szStringTest = "The quick fox jumped over the lazy dog's back.\0"; -const char* szWritableFile = "writeable.txt"; +#define szStringTest "The quick fox jumped over the lazy dog's back.\0" +#define szWritableFile "writeable.txt" -BOOL validateResults(const char* szString) +BOOL validateResults_WriteFile_test3(const char* szString) { FILE *pFile = NULL; char szReadString[100]; @@ -58,7 +58,7 @@ BOOL validateResults(const char* szString) -BOOL writeTest(const char* szString) +BOOL writeTest_WriteFile_test3(const char* szString) { HANDLE hFile = NULL; DWORD dwBytesWritten; @@ -104,7 +104,7 @@ BOOL writeTest(const char* szString) } else { - return (validateResults(szString)); + return (validateResults_WriteFile_test3(szString)); } return TRUE; @@ -113,7 +113,7 @@ BOOL writeTest(const char* szString) -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_WriteFile_test3_paltest_writefile_test3, "file_io/WriteFile/test3/paltest_writefile_test3") { const char *pString = szStringTest; BOOL bRc = FALSE; @@ -124,7 +124,7 @@ int __cdecl main(int argc, char *argv[]) } - bRc = writeTest(pString); + bRc = writeTest_WriteFile_test3(pString); if (bRc != TRUE) { Fail("WriteFile: ERROR -> Failed\n"); diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/testinfo.dat deleted file mode 100644 index cba76f89a39..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = WriteFile -Name = Positive Test for WriteFile -Type = DEFAULT -EXE1 = writefile -Description -=Multiple consecutive writes to a file with verification - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt deleted file mode 100644 index 68327e29c8c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - writefile.cpp -) - -add_executable(paltest_writefile_test4 - ${SOURCES} -) - -add_dependencies(paltest_writefile_test4 coreclrpal) - -target_link_libraries(paltest_writefile_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/testinfo.dat deleted file mode 100644 index f3627273f75..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = WriteFile -Name = Positive Test for WriteFile -Type = DEFAULT -EXE1 = writefile -Description -= writes to a file at different locations with verification - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp index 4eb2b20ee01..34ab4810353 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp @@ -24,7 +24,7 @@ #include <palsuite.h> -BOOL CleanUp(HANDLE hFile, const char * fileName) +BOOL CleanUp_WriteFile_test4(HANDLE hFile, const char * fileName) { BOOL bRc = TRUE; if (CloseHandle(hFile) != TRUE) @@ -42,7 +42,7 @@ BOOL CleanUp(HANDLE hFile, const char * fileName) return bRc; } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_WriteFile_test4_paltest_writefile_test4, "file_io/WriteFile/test4/paltest_writefile_test4") { const char* szStringTest = "1234567890"; const char* szWritableFile = "writeable.txt"; @@ -80,14 +80,14 @@ int __cdecl main(int argc, char *argv[]) { Trace("WriteFile: ERROR -> Unable to write to file error: %ld \n", GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } if(!FlushFileBuffers(hFile)) { Trace("WriteFile: ERROR -> Call to FlushFile Buffers failed " "error %ld \n",GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } @@ -97,7 +97,7 @@ int __cdecl main(int argc, char *argv[]) Trace("WriteFile: ERROR -> writing %u chars to empty file " "caused its size to become %u\n",strlen(szStringTest), GetFileSize(hFile, NULL)); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } @@ -120,7 +120,7 @@ int __cdecl main(int argc, char *argv[]) Trace("WriteFile: ERROR -> Unable to write to file after " " moiving the file poiner to 5 error: %ld \n", GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } @@ -129,7 +129,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("WriteFile: ERROR -> Call to FlushFile Buffers failed " "error %ld \n",GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } @@ -140,11 +140,11 @@ int __cdecl main(int argc, char *argv[]) "sitting the file pointer to 5 resulted in wrong file size; " "Expected %u resulted %u.",strlen(szStringTest), (strlen(szStringTest)+5),GetFileSize(hFile, NULL)); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test4(hFile,szWritableFile); Fail(""); } - if (!CleanUp(hFile,szWritableFile)) + if (!CleanUp_WriteFile_test4(hFile,szWritableFile)) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt deleted file mode 100644 index dbb06ddf487..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - writefile.cpp -) - -add_executable(paltest_writefile_test5 - ${SOURCES} -) - -add_dependencies(paltest_writefile_test5 coreclrpal) - -target_link_libraries(paltest_writefile_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/testinfo.dat deleted file mode 100644 index 5f723992768..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = WriteFile -Name = Positive Test for WriteFile -Type = DEFAULT -EXE1 = writefile -Description -= write lots of data to a file. then check with -= GetFileSize -= This test is disabled due to its time overhead. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp index e1ddf22ad4d..a9f1af7baa8 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp @@ -21,7 +21,7 @@ #include <palsuite.h> -BOOL CleanUp(HANDLE hFile, const char * fileName) +BOOL CleanUp_WriteFile_test5(HANDLE hFile, const char * fileName) { BOOL bRc = TRUE; if (CloseHandle(hFile) != TRUE) @@ -40,7 +40,7 @@ BOOL CleanUp(HANDLE hFile, const char * fileName) } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_WriteFile_test5_paltest_writefile_test5, "file_io/WriteFile/test5/paltest_writefile_test5") { HANDLE hFile = NULL; @@ -81,7 +81,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("WriteFile: ERROR -> Unable to write to file error: %ld \n", GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test5(hFile,szWritableFile); Fail(""); } @@ -91,7 +91,7 @@ int __cdecl main(int argc, char *argv[]) { Trace("WriteFile: ERROR -> Call to FlushFileBuffers failed" "error %ld \n",GetLastError()); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test5(hFile,szWritableFile); Fail(""); } @@ -101,12 +101,12 @@ int __cdecl main(int argc, char *argv[]) Trace("WriteFile: ERROR -> file size did not change properly" " after writing 4000 000 chars to it ( size= %u )\n", GetFileSize(hFile,NULL)); - CleanUp(hFile,szWritableFile); + CleanUp_WriteFile_test5(hFile,szWritableFile); Fail(""); } - if (!CleanUp(hFile,szWritableFile)) + if (!CleanUp_WriteFile_test5(hFile,szWritableFile)) { Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt deleted file mode 100644 index f50f97a5851..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_errorpathnotfound_test1 - ${SOURCES} -) - -add_dependencies(paltest_errorpathnotfound_test1 coreclrpal) - -target_link_libraries(paltest_errorpathnotfound_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp index 8a2654b1193..fa624a352e7 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp @@ -36,7 +36,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_errorpathnotfound_test1_paltest_errorpathnotfound_test1, "file_io/errorpathnotfound/test1/paltest_errorpathnotfound_test1") { diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/testinfo.dat deleted file mode 100644 index 761ca9aed2b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/testinfo.dat +++ /dev/null @@ -1,30 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. - -# The .NET Foundation licenses this file to you under the MIT license. - - - - - -Version = 1.0 - -Section = file_io - -Function = some File_io functions - -Name = errorpathnotfound - checking GetLastError. - -Type = DEFAULT - -EXE1 = test1 - -Description - -= Test the return value of GetLastError() after calling - -= some file_io functions with an invalid path. - -= Functions covered by this test are: - -= CopyFile, CreateFile and DeleteFile. - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt deleted file mode 100644 index 277855a74b7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_errorpathnotfound_test2 - ${SOURCES} -) - -add_dependencies(paltest_errorpathnotfound_test2 coreclrpal) - -target_link_libraries(paltest_errorpathnotfound_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp index b6a439a5786..927f800c1e4 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp @@ -38,7 +38,7 @@ -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_errorpathnotfound_test2_paltest_errorpathnotfound_test2, "file_io/errorpathnotfound/test2/paltest_errorpathnotfound_test2") { diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/testinfo.dat deleted file mode 100644 index 1b04b9766f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/testinfo.dat +++ /dev/null @@ -1,31 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. - -# The .NET Foundation licenses this file to you under the MIT license. - - - - -Version = 1.0 - -Section = file_io - -Function = some File_io functions - -Name = errorpathnotfound - checking GetLastError. - -Type = DEFAULT - -EXE1 = test2 - -Description - -= Test the return value of GetLastError() after calling - -= some file_io functions with an invalid path. - -= Functions covered by this test are: - -= FindFirstFileA, FindFirstFileW, - -= GetFileAttributesA, GetFileAttributesW, - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt deleted file mode 100644 index 6b8473aa529..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - gettemppatha.cpp -) - -add_executable(paltest_gettemppatha_test1 - ${SOURCES} -) - -add_dependencies(paltest_gettemppatha_test1 coreclrpal) - -target_link_libraries(paltest_gettemppatha_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp b/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp index 55ca7db7ca4..30845d788a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp +++ b/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp @@ -62,7 +62,7 @@ static void SetAndCheckLength(CHAR tmpDirPath[], int bufferLength, int expectedR } } -int __cdecl main(int argc, char *argv[]) +PALTEST(file_io_gettemppatha_test1_paltest_gettemppatha_test1, "file_io/gettemppatha/test1/paltest_gettemppatha_test1") { if (0 != PAL_Initialize(argc,argv)) { diff --git a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/testinfo.dat deleted file mode 100644 index 700a0c72c1e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/file_io/gettemppatha/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = file_io -Function = GetTempPathA -Name = Test for GetTempPathA (test 1) -Type = DEFAULT -EXE1 = gettemppatha -Description -= Calls GetTempPathA and verifies by passing the returned -= value to CreateDirectoryA. If the returned path exists, -= CreateDirectoryA will fail. - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CMakeLists.txt deleted file mode 100644 index 742e29b85da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -add_subdirectory(CreateFileMappingW) -add_subdirectory(FreeLibrary) -add_subdirectory(FreeLibraryAndExitThread) -add_subdirectory(GetModuleFileNameA) -add_subdirectory(GetModuleFileNameW) -add_subdirectory(GetProcAddress) -add_subdirectory(LocalAlloc) -add_subdirectory(LocalFree) -add_subdirectory(MapViewOfFile) -add_subdirectory(OpenFileMappingW) -add_subdirectory(ProbeMemory) -add_subdirectory(UnmapViewOfFile) -add_subdirectory(VirtualAlloc) -add_subdirectory(VirtualFree) -add_subdirectory(VirtualProtect) -add_subdirectory(VirtualQuery) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CMakeLists.txt deleted file mode 100644 index c9599098417..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_subdirectory(CreateFileMapping_neg1) -add_subdirectory(test1) - -# TODO: make this test compile -# add_subdirectory(test2) - -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt deleted file mode 100644 index 8e106a7decc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMapping_neg.cpp -) - -add_executable(paltest_createfilemappingw_createfilemapping_neg1 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_createfilemapping_neg1 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_createfilemapping_neg1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp index 3fd3d208670..91400a3a5c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp @@ -16,7 +16,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_CreateFileMapping_neg1_paltest_createfilemappingw_createfilemapping_neg1, "filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/paltest_createfilemappingw_createfilemapping_neg1") { HANDLE FileHandle; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/testinfo.dat deleted file mode 100644 index 7b8b1bbd463..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMapping -Name = Negative test for CreateFileMappingW - with a zero length file -TYPE = DEFAULT -EXE1 = createfilemapping_neg -Description -=Test the CreateFileMapping to try to map a zero length file diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt deleted file mode 100644 index decb9995f32..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test1 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test1 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp index b17ecfac0ad..316320949a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp @@ -15,7 +15,7 @@ const int MAPPINGSIZE = 2048; -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test1_paltest_createfilemappingw_test1, "filemapping_memmgt/CreateFileMappingW/test1/paltest_createfilemappingw_test1") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/testinfo.dat deleted file mode 100644 index e132c6324c9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW with PAGE_READONLY -TYPE = DEFAULT -EXE1 = createfilemappingw -Description -=Test the CreateFileMappingW to create a unnamed file-mapping object -=and with PAGE_READONLY protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt deleted file mode 100644 index 618abe04d79..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test2 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test2 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp index 9f13cd7ce7a..bacdc92365c 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp @@ -15,7 +15,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test2_paltest_createfilemappingw_test2, "filemapping_memmgt/CreateFileMappingW/test2/paltest_createfilemappingw_test2") { HANDLE FileHandle; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt deleted file mode 100644 index 46723a0d270..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test3 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test3 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp index 867b51b1668..409e829718e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp @@ -15,7 +15,7 @@ const int MAPPINGSIZE = 2048; -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test3_paltest_createfilemappingw_test3, "filemapping_memmgt/CreateFileMappingW/test3/paltest_createfilemappingw_test3") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/testinfo.dat deleted file mode 100644 index 6cd0d3eef8b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW with PAGE_READWRITE -TYPE = DEFAULT -EXE1 = createfilemappingw -Description -=Test the CreateFileMappingW to create a unnamed file-mapping object -=and with PAGE_READWRITE protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt deleted file mode 100644 index b9ab8610773..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test4 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test4 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp index e439ed0c939..1ac6815542a 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp @@ -15,7 +15,7 @@ const int MAPPINGSIZE = 2048; -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test4_paltest_createfilemappingw_test4, "filemapping_memmgt/CreateFileMappingW/test4/paltest_createfilemappingw_test4") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/testinfo.dat deleted file mode 100644 index 2a1e78b640f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW with PAGE_WRITECOPY. -TYPE = DEFAULT -EXE1 = createfilemappingw -Description -=Test the CreateFileMapping to create a unnamed file-mapping object -=and with PAGE_WRITE protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt deleted file mode 100644 index 933596a7c2f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test5 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test5 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp index a45267d4d30..098f7a09a0a 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> const int MAPPINGSIZE = 2048; -HANDLE SWAP_HANDLE = ((VOID *)(-1)); -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test5_paltest_createfilemappingw_test5, "filemapping_memmgt/CreateFileMappingW/test5/paltest_createfilemappingw_test5") { + HANDLE SWAP_HANDLE = ((VOID *)(-1)); char testString[] = "this is a test string"; WCHAR lpObjectName[] = {'m','y','O','b','j','e','c','t','\0'}; int RetVal = FAIL; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/testinfo.dat deleted file mode 100644 index dfc444e6f60..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW - PAGE_READWRITE -TYPE = DEFAULT -EXE1 = createfilemappingw -Description -= Positive test the CreateFileMappingW API. -= Test CreateFileMappingW to create a named -= "swap" handle with access PAGE_READONLY. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt deleted file mode 100644 index abd57dded2f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateFileMappingW.cpp -) - -add_executable(paltest_createfilemappingw_test6 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test6 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp index 635999a6ab4..615d2612149 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> const int MAPPINGSIZE = 2048; -HANDLE SWAP_HANDLE = ((VOID *)(-1)); -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test6_paltest_createfilemappingw_test6, "filemapping_memmgt/CreateFileMappingW/test6/paltest_createfilemappingw_test6") { + HANDLE SWAP_HANDLE = ((VOID *)(-1)); char testString[] = "this is a test string"; WCHAR lpObjectName[] = {'m','y','O','b','j','e','c','t','\0'}; char results[2048]; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/testinfo.dat deleted file mode 100644 index 07a09140cff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMapping -Name = CreateFileMappingW - with PAGE_READONLY -TYPE = DEFAULT -EXE1 = createfilemappingw -Description -= Positive test the CreateFileMappingW API. -= Test CreateFileMappingW to create a named -= "swap" handle with access PAGE_READWRITE. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt deleted file mode 100644 index 011f6e1b4c6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createfilemapping.cpp -) - -add_executable(paltest_createfilemappingw_test7 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test7 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp index 3141f7ea2e2..48c2361fadd 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> const int MAPPINGSIZE = 2048; -HANDLE SWAP_HANDLE = ((VOID *)(-1)); -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test7_paltest_createfilemappingw_test7, "filemapping_memmgt/CreateFileMappingW/test7/paltest_createfilemappingw_test7") { + HANDLE SWAP_HANDLE = ((VOID *)(-1)); char testString[] = "this is a test string"; WCHAR lpObjectName[] = {'m','y','O','b','j','e','c','t','\0'}; char results[2048]; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/testinfo.dat deleted file mode 100644 index 3c499001a47..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW - PAGE_COPYWRITE -TYPE = DEFAULT -EXE1 = createfilemapping -Description -= Positive test the CreateFileMappingW API. -= Test CreateFileMappingW to create a named -= "swap" handle with access PAGE_READWRITE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt deleted file mode 100644 index 6e01ec7c789..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createfilemapping.cpp -) - -add_executable(paltest_createfilemappingw_test8 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test8 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp index 54543d5f218..8a264ea83e1 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp @@ -14,10 +14,10 @@ #include <palsuite.h> const int MAPPINGSIZE = 2048; -HANDLE SWAP_HANDLE = ((VOID *)(-1)); -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test8_paltest_createfilemappingw_test8, "filemapping_memmgt/CreateFileMappingW/test8/paltest_createfilemappingw_test8") { + HANDLE SWAP_HANDLE = ((VOID *)(-1)); WCHAR lpObjectName[] = {'m','y','O','b','j','e','c','t','\0'}; HANDLE hFileMap; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/testinfo.dat deleted file mode 100644 index 3d8364d5abf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW - Special cases -Name = CreateFileMappingW -TYPE = DEFAULT -EXE1 = createfilemapping -Description -= Positive test the CreateFileMappingW API. -= Test the un-verifiable parameter combinations. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt deleted file mode 100644 index b069bc6ed76..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createfilemapping.cpp -) - -add_executable(paltest_createfilemappingw_test9 - ${SOURCES} -) - -add_dependencies(paltest_createfilemappingw_test9 coreclrpal) - -target_link_libraries(paltest_createfilemappingw_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp index e062e4543d3..70c52936011 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp @@ -14,7 +14,7 @@ const int MAPPINGSIZE = 2048; -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_CreateFileMappingW_test9_paltest_createfilemappingw_test9, "filemapping_memmgt/CreateFileMappingW/test9/paltest_createfilemappingw_test9") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/testinfo.dat deleted file mode 100644 index b3baf015a10..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = CreateFileMappingW -Name = CreateFileMappingW negative testing -TYPE = DEFAULT -EXE1 = createfilemapping -Description -= Negative test the CreateFileMapping API. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt deleted file mode 100644 index 66341ef4eca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - dlltest.cpp - FreeLibrary.cpp -) - -add_executable(paltest_freelibrary_test1 - ${SOURCES} -) - -add_dependencies(paltest_freelibrary_test1 coreclrpal) - -target_link_libraries(paltest_freelibrary_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp index 093242db635..528a1cca29f 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp @@ -25,7 +25,7 @@ BOOL PALAPI TestDll(HMODULE, int); -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_FreeLibrary_test1_paltest_freelibrary_test1, "filemapping_memmgt/FreeLibrary/test1/paltest_freelibrary_test1") { HANDLE hLib; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/testinfo.dat deleted file mode 100644 index 6e6e9f3f401..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = FreeLibrary -Name = Positive test for FreeLibrary API -TYPE = DEFAULT -EXE1 = freelibrary -LIB1 = dlltest -Description -=Test the FreeLibrary to decrement the reference -=count of the loaded DLL diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt deleted file mode 100644 index 126d16b2484..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_freelibrary_test2 - ${SOURCES} -) - -add_dependencies(paltest_freelibrary_test2 coreclrpal) - -target_link_libraries(paltest_freelibrary_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp index 2cf10ee8ee1..c360743c445 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char* argv[]) +PALTEST(filemapping_memmgt_FreeLibrary_test2_paltest_freelibrary_test2, "filemapping_memmgt/FreeLibrary/test2/paltest_freelibrary_test2") { HANDLE hLib; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/testinfo.dat deleted file mode 100644 index 44c99fb3ce3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = FreeLibrary -Name = Negative test for FreeLibrary -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the FreeLibrary function. -= This is a negative test that will pass an invalid and a -= null handle to FreeLibrary. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt deleted file mode 100644 index 5e268fbff5f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - dlltest.cpp - test1.cpp -) - -add_executable(paltest_freelibraryandexitthread_test1 - ${SOURCES} -) - -add_dependencies(paltest_freelibraryandexitthread_test1 coreclrpal) - -target_link_libraries(paltest_freelibraryandexitthread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp index 2306a190d0f..97448fadaf9 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp @@ -27,11 +27,11 @@ #define TIMEOUT 60000 -BOOL PALAPI StartThreadTest(); -DWORD PALAPI CreateTestThread(LPVOID); -BOOL PALAPI TestDll(HMODULE, int); +BOOL PALAPI StartThreadTest_FreeLibraryAndExitThread_test1(); +DWORD PALAPI CreateTestThread_FreeLibraryAndExitThread_test1(LPVOID); +BOOL PALAPI TestDll_FreeLibraryAndExitThread_test1(HMODULE, int); -int __cdecl main(int argc, char* argv[]) +PALTEST(filemapping_memmgt_FreeLibraryAndExitThread_test1_paltest_freelibraryandexitthread_test1, "filemapping_memmgt/FreeLibraryAndExitThread/test1/paltest_freelibraryandexitthread_test1") { /*Initialize the PAL*/ if ((PAL_Initialize(argc, argv)) != 0) @@ -39,7 +39,7 @@ int __cdecl main(int argc, char* argv[]) return (FAIL); } - if (!StartThreadTest()) + if (!StartThreadTest_FreeLibraryAndExitThread_test1()) { Fail("ERROR: FreeLibraryAndExitThread test failed.\n"); } @@ -51,12 +51,12 @@ int __cdecl main(int argc, char* argv[]) } -BOOL PALAPI StartThreadTest() +BOOL PALAPI StartThreadTest_FreeLibraryAndExitThread_test1() { HMODULE hLib; HANDLE hThread; DWORD dwThreadId; - LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread; + LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread_FreeLibraryAndExitThread_test1; LPVOID lpParameter = (LPVOID)lpStartAddress; DWORD rc = -1; /*Load library (DLL).*/ @@ -101,7 +101,7 @@ BOOL PALAPI StartThreadTest() } /*Test access to DLL.*/ - if(!TestDll(hLib, 0)) + if(!TestDll_FreeLibraryAndExitThread_test1(hLib, 0)) { Trace("ERROR: TestDll function returned FALSE " "expected TRUE\n."); @@ -117,7 +117,7 @@ BOOL PALAPI StartThreadTest() return (TRUE); } -BOOL PALAPI TestDll(HMODULE hLib, int testResult) +BOOL PALAPI TestDll_FreeLibraryAndExitThread_test1(HMODULE hLib, int testResult) { int RetVal; char FunctName[] = "DllTest"; @@ -164,10 +164,10 @@ BOOL PALAPI TestDll(HMODULE hLib, int testResult) return (TRUE); } -DWORD PALAPI CreateTestThread(LPVOID lpParam) +DWORD PALAPI CreateTestThread_FreeLibraryAndExitThread_test1(LPVOID lpParam) { /* Test access to DLL.*/ - TestDll(lpParam, 1); + TestDll_FreeLibraryAndExitThread_test1(lpParam, 1); /*Free library and exit thread.*/ FreeLibraryAndExitThread(lpParam, (DWORD)0); diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/testinfo.dat deleted file mode 100644 index cdadee335ab..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = FreeLibraryAndExitThread -Name = Positive test for FreeLibraryAndExitThread -TYPE = DEFAULT -EXE1 = test1 -LIB1 = dlltest -Description -= Tests the PAL implementation of the FreeLibraryAndExitThread -= function. When run, FreeLibraryAndExitThread will exit the -= process that it is called within, therefore we create a -= thread to run the API. Then we test for the existance of the -= thread and access to the library. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt deleted file mode 100644 index fd7fa6bdfca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetModuleFileNameA.cpp -) - -add_executable(paltest_getmodulefilenamea_test1 - ${SOURCES} -) - -add_dependencies(paltest_getmodulefilenamea_test1 coreclrpal) - -target_link_libraries(paltest_getmodulefilenamea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp index 78550913b59..c5fc79f7ad9 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp @@ -26,7 +26,7 @@ #define Delimiter "\\" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetModuleFileNameA_test1_paltest_getmodulefilenamea_test1, "filemapping_memmgt/GetModuleFileNameA/test1/paltest_getmodulefilenamea_test1") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/testinfo.dat deleted file mode 100644 index 72196a4cc64..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = GetModuleFileNameA -Name = Positive test for GetModuleFileNameA API -TYPE = DEFAULT -EXE1 = getmodulefilenamea -Description -=Test the GetModuleFileNameA to retrieve the specified module -=full path and file name diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt deleted file mode 100644 index 5dd6e857a31..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetModuleFileNameA.cpp -) - -add_executable(paltest_getmodulefilenamea_test2 - ${SOURCES} -) - -add_dependencies(paltest_getmodulefilenamea_test2 coreclrpal) - -target_link_libraries(paltest_getmodulefilenamea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp index 99cfeb7c1cf..b888ce3e93a 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp @@ -16,7 +16,7 @@ #define MODULENAMEBUFFERSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetModuleFileNameA_test2_paltest_getmodulefilenamea_test2, "filemapping_memmgt/GetModuleFileNameA/test2/paltest_getmodulefilenamea_test2") { DWORD ModuleNameLength; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/testinfo.dat deleted file mode 100644 index 9f6c7d8b4f4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = GetModuleFileNameA -Name = Positive test for GetModuleFileNameA API -TYPE = DEFAULT -EXE1 = getmodulefilenamea -Description -=Test the GetModuleFileNameA to retrieve current process full -=full path and file name by passing a NULL module handle diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt deleted file mode 100644 index 0488cc9a3ef..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetModuleFileNameW.cpp -) - -add_executable(paltest_getmodulefilenamew_test1 - ${SOURCES} -) - -add_dependencies(paltest_getmodulefilenamew_test1 coreclrpal) - -target_link_libraries(paltest_getmodulefilenamew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp index d38ea321857..db9daafd9b1 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp @@ -25,7 +25,7 @@ #define Delimiter "\\" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetModuleFileNameW_test1_paltest_getmodulefilenamew_test1, "filemapping_memmgt/GetModuleFileNameW/test1/paltest_getmodulefilenamew_test1") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/testinfo.dat deleted file mode 100644 index e6e090035fc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = GetModuleFileNameW -Name = Positive test for GetModuleFileNameW API -TYPE = DEFAULT -EXE1 = getmodulefilenamew -Description -=Test the GetModuleFileNameW to retrieve the specified module -=full path and file name in UNICODE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt deleted file mode 100644 index f3a51c31d61..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - GetModuleFileNameW.cpp -) - -add_executable(paltest_getmodulefilenamew_test2 - ${SOURCES} -) - -add_dependencies(paltest_getmodulefilenamew_test2 coreclrpal) - -target_link_libraries(paltest_getmodulefilenamew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp index b9f52970eb3..cf93a94db98 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp @@ -18,7 +18,7 @@ #define MODULENAMEBUFFERSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetModuleFileNameW_test2_paltest_getmodulefilenamew_test2, "filemapping_memmgt/GetModuleFileNameW/test2/paltest_getmodulefilenamew_test2") { DWORD ModuleNameLength; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/testinfo.dat deleted file mode 100644 index 47a5defb23b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = GetModuleFileNameW -Name = Positive test for GetModuleFileNameW API -TYPE = DEFAULT -EXE1 = getmodulefilenamew -Description -=Test the GetModuleFileNameW to retrieve current process full -=full path and file name by passing a NULL module handle in UNICODE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt deleted file mode 100644 index 6398b4eb238..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - test1.cpp - testlib.cpp -) - -add_executable(paltest_getprocaddress_test1 - ${SOURCES} -) - -add_dependencies(paltest_getprocaddress_test1 coreclrpal) - -target_link_libraries(paltest_getprocaddress_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp index 78d6a565f64..183177fb384 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp @@ -23,7 +23,7 @@ typedef int (PALAPI_NOEXPORT *SIMPLEFUNCTION)(int); #define lpModuleName "testlib.dll" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "filemapping_memmgt/GetProcAddress/test1/paltest_getprocaddress_test1") { int err; HMODULE hModule; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testinfo.dat deleted file mode 100644 index 8bc3b446977..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = filemapping_memmgt -Function = getprocaddress -Name = Positive test for GetProcAddress API -TYPE = DEFAULT -EXE1 = test1 -LIB1 = testlib -Description -=Positive test the GetProcAddress API. -=The first test calls GetProcAddress to retrieve the -=address of strcpy by its name, then calls the function and -=checks that it worked. The second part of the test -=calls GetProcAddress to retrieve the address of -=strcpy by its ordinal, then calls the function and -=checks that it worked. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt deleted file mode 100644 index d328f4c8159..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - test2.cpp - testlib.cpp -) - -add_executable(paltest_getprocaddress_test2 - ${SOURCES} -) - -add_dependencies(paltest_getprocaddress_test2 coreclrpal) - -target_link_libraries(paltest_getprocaddress_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp index fdd5d856766..8556a67086e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp @@ -26,7 +26,7 @@ /** * main */ -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "filemapping_memmgt/GetProcAddress/test2/paltest_getprocaddress_test2") { int err; HMODULE hModule; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testinfo.dat deleted file mode 100644 index 4e64e8ccf92..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = filemapping_memmgt -Function = getprocaddress -Name = Negative test for GetProcAddress API -TYPE = DEFAULT -EXE1 = test2 -LIB1 = testlib -Description -=This test tries to call GetProcAddress with -=a NULL handle, with a NULL function name, with an empty -=function name, with an invalid name and with an -=nvalid ordinal value. - - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt deleted file mode 100644 index 910d3b19152..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LocalAlloc.cpp -) - -add_executable(paltest_localalloc_test1 - ${SOURCES} -) - -add_dependencies(paltest_localalloc_test1 coreclrpal) - -target_link_libraries(paltest_localalloc_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp index 1b349069f04..5879ed59807 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_LocalAlloc_test1_paltest_localalloc_test1, "filemapping_memmgt/LocalAlloc/test1/paltest_localalloc_test1") { HLOCAL LocalHeap; HLOCAL FreeHeap; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/testinfo.dat deleted file mode 100644 index b1626eff32c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = LocalAlloc -Name = Positive test LocalAlloc API to Allocate the specified number of bytes from the heap -TYPE = DEFAULT -EXE1 = localalloc -Description -=Test the LocalAlloc with zero ad allocation attribute diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt deleted file mode 100644 index cc406ce212b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LocalFree.cpp -) - -add_executable(paltest_localfree_test1 - ${SOURCES} -) - -add_dependencies(paltest_localfree_test1 coreclrpal) - -target_link_libraries(paltest_localfree_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp index 86d27b45586..0fcb32d6fc9 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_LocalFree_test1_paltest_localfree_test1, "filemapping_memmgt/LocalFree/test1/paltest_localfree_test1") { HLOCAL LocalHeap; HLOCAL FreeHeap; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/testinfo.dat deleted file mode 100644 index 2fb5007769f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = LocalFree -Name = Positive test LocalFree API to free a specified local memory object -TYPE = DEFAULT -EXE1 = localfree -Description -=Test the LocalFree to free a specified local memory object diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt deleted file mode 100644 index b069f7e87e6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LocalFree.cpp -) - -add_executable(paltest_localfree_test2 - ${SOURCES} -) - -add_dependencies(paltest_localfree_test2 coreclrpal) - -target_link_libraries(paltest_localfree_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp index 587036041c1..5d66077a2cf 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_LocalFree_test2_paltest_localfree_test2, "filemapping_memmgt/LocalFree/test2/paltest_localfree_test2") { HLOCAL FreeHeap; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/testinfo.dat deleted file mode 100644 index aab6b36a74e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = LocalFree -Name = Positive test LocalFree API by passing NULL as local memory object handle -TYPE = DEFAULT -EXE1 = localfree -Description -=Test the LocalFree by passing NULL -=as a local memory object handle diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt deleted file mode 100644 index 384729f48b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - MapViewOfFile.cpp -) - -add_executable(paltest_mapviewoffile_test1 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test1 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp index 9f0f6b8fa90..0c25bdbc46d 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp @@ -26,7 +26,7 @@ #define TEMP_DIRECTORY_PATH "/data/local/tmp/" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test1_paltest_mapviewoffile_test1, "filemapping_memmgt/MapViewOfFile/test1/paltest_mapviewoffile_test1") { HANDLE hFile = INVALID_HANDLE_VALUE; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/testinfo.dat deleted file mode 100644 index 84e3addeeb3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Positive test MapViewOfFile API with access FILE_MAP_READ -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -=Test the MapViewOfFile with access FILE_MAP_READ diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt deleted file mode 100644 index 0d4f42525b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - MapViewOfFile.cpp -) - -add_executable(paltest_mapviewoffile_test2 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test2 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp index e34960158a4..8de37a15619 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp @@ -22,7 +22,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test2_paltest_mapviewoffile_test2, "filemapping_memmgt/MapViewOfFile/test2/paltest_mapviewoffile_test2") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/testinfo.dat deleted file mode 100644 index b8ed53e8f38..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Positive test for MapViewOfFile API with access FILE_MAP_WRITE -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -=Test the MapViewOfFile with access FILE_MAP_WRITE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt deleted file mode 100644 index 8da6c06890e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - MapViewOfFile.cpp -) - -add_executable(paltest_mapviewoffile_test3 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test3 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp index 3a8990e3ace..b5d4ef34623 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp @@ -22,7 +22,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test3_paltest_mapviewoffile_test3, "filemapping_memmgt/MapViewOfFile/test3/paltest_mapviewoffile_test3") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/testinfo.dat deleted file mode 100644 index 34f83cad17a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Positive test MapViewOfFile API with access FILE_MAP_ALL_ACCESS -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -=Test the MapViewOfFile with access FILE_MAP_ALL_ACCESS diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt deleted file mode 100644 index 3b43a5e2e7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - mapviewoffile.cpp -) - -add_executable(paltest_mapviewoffile_test4 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test4 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp index 66a72896eeb..00139eda9da 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp @@ -19,7 +19,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test4_paltest_mapviewoffile_test4, "filemapping_memmgt/MapViewOfFile/test4/paltest_mapviewoffile_test4") { HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/testinfo.dat deleted file mode 100644 index 84e96b38bcd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Negative test MapViewOfFile API -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -= Negative test the MapViewOfFile API. -= Call MapViewOfFile with all access modes, -= except read-only, on a read only map. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt deleted file mode 100644 index ace9e601f38..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - mapviewoffile.cpp -) - -add_executable(paltest_mapviewoffile_test5 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test5 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp index ee920301fc3..a2c221f159e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp @@ -18,7 +18,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test5_paltest_mapviewoffile_test5, "filemapping_memmgt/MapViewOfFile/test5/paltest_mapviewoffile_test5") { const int MAPPINGSIZE = 2048; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/testinfo.dat deleted file mode 100644 index 2427779c0a1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Negative test for MapViewOfFile API. -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -= Negative test the MapViewOfFile API. -= Passing invalid values for the hFileMappingObject. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt deleted file mode 100644 index 1855c6ea347..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - mapviewoffile.cpp -) - -add_executable(paltest_mapviewoffile_test6 - ${SOURCES} -) - -add_dependencies(paltest_mapviewoffile_test6 coreclrpal) - -target_link_libraries(paltest_mapviewoffile_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp index 0e719ad7338..c118fa1f669 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp @@ -17,7 +17,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_MapViewOfFile_test6_paltest_mapviewoffile_test6, "filemapping_memmgt/MapViewOfFile/test6/paltest_mapviewoffile_test6") { const int MAPPINGSIZE = 2048; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/testinfo.dat deleted file mode 100644 index 6112c648cfe..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = MapViewOfFile -Name = Positive test for MapViewOfFile API. -TYPE = DEFAULT -EXE1 = mapviewoffile -Description -= Positive test the MapViewOfFile API. -= Mapping in a section of anonymous pagefile diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt deleted file mode 100644 index 20b340f819f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - OpenFileMappingW.cpp -) - -add_executable(paltest_openfilemappingw_test1 - ${SOURCES} -) - -add_dependencies(paltest_openfilemappingw_test1 coreclrpal) - -target_link_libraries(paltest_openfilemappingw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp index f5680f070b3..a7ba76aa7b1 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp @@ -15,7 +15,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_OpenFileMappingW_test1_paltest_openfilemappingw_test1, "filemapping_memmgt/OpenFileMappingW/test1/paltest_openfilemappingw_test1") { HANDLE lpMapViewAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/testinfo.dat deleted file mode 100644 index 78401088492..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = OpenFileMappingW -Name = Positive test for OpenFileMappingW API -TYPE = DEFAULT -EXE1 = openfilemappingw -Description -=Test the OpenFileMappingW with FILE_MAP_ALL_ACCESS access diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt deleted file mode 100644 index 4f50f1e6300..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - OpenFileMappingW.cpp -) - -add_executable(paltest_openfilemappingw_test2 - ${SOURCES} -) - -add_dependencies(paltest_openfilemappingw_test2 coreclrpal) - -target_link_libraries(paltest_openfilemappingw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp index 8b9f08955f4..c1d43ab16f9 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_OpenFileMappingW_test2_paltest_openfilemappingw_test2, "filemapping_memmgt/OpenFileMappingW/test2/paltest_openfilemappingw_test2") { HANDLE FileMappingHandle; HANDLE OpenFileMappingHandle; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/testinfo.dat deleted file mode 100644 index fc258fed1f9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = OpenFileMappingW -Name = Positive test for OpenFileMappingW API -TYPE = DEFAULT -EXE1 = openfilemappingw -Description -=Test the OpenFileMappingW with FILE_MAP_WRITE access diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt deleted file mode 100644 index 3fc9328cab3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - OpenFileMappingW.cpp -) - -add_executable(paltest_openfilemappingw_test3 - ${SOURCES} -) - -add_dependencies(paltest_openfilemappingw_test3 coreclrpal) - -target_link_libraries(paltest_openfilemappingw_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp index 7b55dfc428b..ebffd6f2baf 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_OpenFileMappingW_test3_paltest_openfilemappingw_test3, "filemapping_memmgt/OpenFileMappingW/test3/paltest_openfilemappingw_test3") { char buf[] = "this is a test"; char ch[1024]; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/testinfo.dat deleted file mode 100644 index 5ec67637095..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = OpenFileMappingW -Name = Positive test for OpenFileMappingW API with FILE_MAP_READ access -TYPE = DEFAULT -EXE1 = openfilemappingw -Description -=Test the OpenFileMappingW with FILE_MAP_READ access diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/CMakeLists.txt deleted file mode 100644 index 680635f23fe..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(ProbeMemory_neg1) -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt deleted file mode 100644 index 50eaf4abf5e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ProbeMemory_neg.cpp -) - -add_executable(paltest_probememory_probememory_neg1 - ${SOURCES} -) - -add_dependencies(paltest_probememory_probememory_neg1 coreclrpal) - -target_link_libraries(paltest_probememory_probememory_neg1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/ProbeMemory_neg.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/ProbeMemory_neg.cpp index 1bca5c662ab..8c052afae85 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/ProbeMemory_neg.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/ProbeMemory_neg.cpp @@ -14,7 +14,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_ProbeMemory_ProbeMemory_neg1_paltest_probememory_probememory_neg1, "filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/paltest_probememory_probememory_neg1") { int err; BOOL bResult; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/testinfo.dat deleted file mode 100644 index 3f4fad67335..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = PAL_ProbeMemory -Name = Negative test PAL_ProbeMemory API to read unreadable memory area -TYPE = DEFAULT -EXE1 = probememory_neg -Description -=Test the PAL_ProbeMemory to read unreadable memory area diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt deleted file mode 100644 index 08308e0e053..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ProbeMemory.cpp -) - -add_executable(paltest_probememory_test1 - ${SOURCES} -) - -add_dependencies(paltest_probememory_test1 coreclrpal) - -target_link_libraries(paltest_probememory_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/ProbeMemory.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/ProbeMemory.cpp index 58dbcd67eb4..ffd00f1d439 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/ProbeMemory.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/ProbeMemory.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_ProbeMemory_test1_paltest_probememory_test1, "filemapping_memmgt/ProbeMemory/test1/paltest_probememory_test1") { int err; BOOL bResult; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/testinfo.dat deleted file mode 100644 index 9fd6b566c59..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = PAL_ProbeMemory -Name = Positive test for PAL_ProbeMemory API to probe for read/write -TYPE = DEFAULT -EXE1 = probememory -Description -=Test the PAL_ProbeMemory to probe for read and write diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt deleted file mode 100644 index 8ada94f50a6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - UnmapViewOfFile.cpp -) - -add_executable(paltest_unmapviewoffile_test1 - ${SOURCES} -) - -add_dependencies(paltest_unmapviewoffile_test1 coreclrpal) - -target_link_libraries(paltest_unmapviewoffile_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp index 3b78ce617ec..8c1fa48d48e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp @@ -22,7 +22,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_UnmapViewOfFile_test1_paltest_unmapviewoffile_test1, "filemapping_memmgt/UnmapViewOfFile/test1/paltest_unmapviewoffile_test1") { const int MappingSize = 2048; HANDLE hFile; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/testinfo.dat deleted file mode 100644 index e5c136b60d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = UnmapViewOfFile -Name = Positive test UnmapViewOfFile API to unmap a view of file -TYPE = DEFAULT -EXE1 = unmapviewoffile -LANG = cpp -Description -= Test the UnmapViewOfFile to unmap a view of file. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt deleted file mode 100644 index 958e36b74e8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - unmapviewoffile.cpp -) - -add_executable(paltest_unmapviewoffile_test2 - ${SOURCES} -) - -add_dependencies(paltest_unmapviewoffile_test2 coreclrpal) - -target_link_libraries(paltest_unmapviewoffile_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/testinfo.dat deleted file mode 100644 index 5229c85d362..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = UnmapViewOfFile -Name = Negative test UnmapViewOfFile API to unmap a view of file -TYPE = DEFAULT -EXE1 = unmapviewoffile -Description -= Test the UnmapViewOfFile to unmap a view of file -= negative test by passing a NULL mapping address. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp index 43ab2b50cd1..b887891c46c 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_UnmapViewOfFile_test2_paltest_unmapviewoffile_test2, "filemapping_memmgt/UnmapViewOfFile/test2/paltest_unmapviewoffile_test2") { int err; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/CMakeLists.txt deleted file mode 100644 index 0960bf91ff5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test20) -add_subdirectory(test21) -add_subdirectory(test22) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt deleted file mode 100644 index 9f5f71e72ab..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test1 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test1 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp index f71175cbe4a..c71373e5b61 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test1_paltest_virtualalloc_test1, "filemapping_memmgt/VirtualAlloc/test1/paltest_virtualalloc_test1") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/testinfo.dat deleted file mode 100644 index f5f57555749..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_READONLY access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt deleted file mode 100644 index 0d04c27dc67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test10 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test10 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp index f24d64b2621..d17b699d5b6 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test10_paltest_virtualalloc_test10, "filemapping_memmgt/VirtualAlloc/test10/paltest_virtualalloc_test10") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/testinfo.dat deleted file mode 100644 index 2c2db5db106..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_RESERVE allocation type -=and PAGE_EXECUTE_READ access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt deleted file mode 100644 index f9b2425986a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test11 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test11 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test11 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp index 5f5440cf0bc..af7549511e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp @@ -14,7 +14,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test11_paltest_virtualalloc_test11, "filemapping_memmgt/VirtualAlloc/test11/paltest_virtualalloc_test11") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/testinfo.dat deleted file mode 100644 index 09830266b74..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_RESERVE allocation type -=and PAGE_EXECUTE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt deleted file mode 100644 index 34b271ffa60..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test12 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test12 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp index a2d8bb5adfb..b6ef0fefcb5 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test12_paltest_virtualalloc_test12, "filemapping_memmgt/VirtualAlloc/test12/paltest_virtualalloc_test12") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/testinfo.dat deleted file mode 100644 index 3b014114d16..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_NOACCESS access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt deleted file mode 100644 index bb1c11f7b1b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test13 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test13 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test13 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp index 0859c49d914..8b6eee22f94 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test13_paltest_virtualalloc_test13, "filemapping_memmgt/VirtualAlloc/test13/paltest_virtualalloc_test13") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/testinfo.dat deleted file mode 100644 index ee11d926b93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_READONLY access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt deleted file mode 100644 index 8f994b1683f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test14 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test14 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test14 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp index e76d12311f7..dd3b1d0d2ac 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test14_paltest_virtualalloc_test14, "filemapping_memmgt/VirtualAlloc/test14/paltest_virtualalloc_test14") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/testinfo.dat deleted file mode 100644 index 5e38441a9fc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt deleted file mode 100644 index cd00816b66a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test15 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test15 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test15 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp index 10922602b1f..58dfa9fcf8b 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test15_paltest_virtualalloc_test15, "filemapping_memmgt/VirtualAlloc/test15/paltest_virtualalloc_test15") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/testinfo.dat deleted file mode 100644 index 76b6ed401cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_EXECUTE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt deleted file mode 100644 index 77435311763..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test16 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test16 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test16 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp index 9cbe6ce8525..dae54ec2826 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test16_paltest_virtualalloc_test16, "filemapping_memmgt/VirtualAlloc/test16/paltest_virtualalloc_test16") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/testinfo.dat deleted file mode 100644 index 6bbb9069a4d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_EXECUTE_READ access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt deleted file mode 100644 index 166eb99be97..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test17 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test17 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test17 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp index d4efeb15408..64e15b5ecd9 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp @@ -14,7 +14,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test17_paltest_virtualalloc_test17, "filemapping_memmgt/VirtualAlloc/test17/paltest_virtualalloc_test17") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/testinfo.dat deleted file mode 100644 index 59155900f02..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_EXECUTE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt deleted file mode 100644 index eef8a48f933..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test18 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test18 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test18 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp index 189298625ca..420e72eb65e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test18_paltest_virtualalloc_test18, "filemapping_memmgt/VirtualAlloc/test18/paltest_virtualalloc_test18") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/testinfo.dat deleted file mode 100644 index a3f0f31a0af..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT|MEM_TOP_DOWN allocation type -=and PAGE_NOACCESS access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt deleted file mode 100644 index b2c5b8a0049..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test19 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test19 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test19 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp index d575daa39c7..28ca74f96eb 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test19_paltest_virtualalloc_test19, "filemapping_memmgt/VirtualAlloc/test19/paltest_virtualalloc_test19") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/testinfo.dat deleted file mode 100644 index 0249bfc187c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc to reserve and commit -=simultaneously by using MEM_COMMIT|MEM_RESERVE|MEM_TOP_DOWN -=allocation type and PAGE_READONLY access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt deleted file mode 100644 index 520cadcc7ef..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test2 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test2 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp index dab649d718f..28b117b6084 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test2_paltest_virtualalloc_test2, "filemapping_memmgt/VirtualAlloc/test2/paltest_virtualalloc_test2") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/testinfo.dat deleted file mode 100644 index 9ca9f0f5fd3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt deleted file mode 100644 index 354b3e641af..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - virtualalloc.cpp -) - -add_executable(paltest_virtualalloc_test20 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test20 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test20 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/testinfo.dat deleted file mode 100644 index a58268126fe..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test VirtualAlloc to ensure that re-committed memory is not changed. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp index 3ed2b40364a..b0fabd54800 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test20_paltest_virtualalloc_test20, "filemapping_memmgt/VirtualAlloc/test20/paltest_virtualalloc_test20") { int err; int *ptr; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt deleted file mode 100644 index bb4cd0ab27a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - virtualalloc.cpp -) - -add_executable(paltest_virtualalloc_test21 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test21 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test21 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/testinfo.dat deleted file mode 100644 index 8fcc04474a9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test VirtualAlloc to ensure that freed memory that is committed again is zeroed. diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp index 1663bf6c195..c45a898b5db 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test21_paltest_virtualalloc_test21, "filemapping_memmgt/VirtualAlloc/test21/paltest_virtualalloc_test21") { int err; int *ptr; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt deleted file mode 100644 index 8d132cc68da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test22 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test22 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test22 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/VirtualAlloc.cpp index 74fea7da177..d256c1220ff 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test22_paltest_virtualalloc_test22, "filemapping_memmgt/VirtualAlloc/test22/paltest_virtualalloc_test22") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/testinfo.dat deleted file mode 100644 index 17da3b1e48e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Negative test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_READWRITEaccess protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt deleted file mode 100644 index 1baefef90e0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test3 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test3 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp index e004a00a47a..cfa22a11ae1 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test3_paltest_virtualalloc_test3, "filemapping_memmgt/VirtualAlloc/test3/paltest_virtualalloc_test3") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/testinfo.dat deleted file mode 100644 index 08181b199c2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_EXECUTE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt deleted file mode 100644 index d9ef27468ae..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test4 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test4 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp index e4250f685dc..f745ec68817 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test4_paltest_virtualalloc_test4, "filemapping_memmgt/VirtualAlloc/test4/paltest_virtualalloc_test4") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/testinfo.dat deleted file mode 100644 index e30903b480f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_EXECUTE_READ access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt deleted file mode 100644 index eb87fe1e662..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test5 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test5 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp index 4ff672bce34..c6014a98ca8 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp @@ -14,7 +14,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test5_paltest_virtualalloc_test5, "filemapping_memmgt/VirtualAlloc/test5/paltest_virtualalloc_test5") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/testinfo.dat deleted file mode 100644 index 929605dec72..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_EXECUTE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt deleted file mode 100644 index de6f2d25463..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test6 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test6 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp index a9a08734f1f..c8d775a96fc 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test6_paltest_virtualalloc_test6, "filemapping_memmgt/VirtualAlloc/test6/paltest_virtualalloc_test6") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/testinfo.dat deleted file mode 100644 index 3b014114d16..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_COMMIT allocation type -=and PAGE_NOACCESS access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt deleted file mode 100644 index d7fcd5a40ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test7 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test7 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp index 27285252f28..3b944007841 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test7_paltest_virtualalloc_test7, "filemapping_memmgt/VirtualAlloc/test7/paltest_virtualalloc_test7") { int err; LPVOID lpVirtualAddress; @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) if(NULL == lpVirtualAddress) { Fail("\nFailed to call VirtualAlloc API!\n"); - PAL_Terminate(); + PAL_TerminateEx(1); return 1; } @@ -42,7 +42,7 @@ int __cdecl main(int argc, char *argv[]) if(0 == err) { Fail("\nFailed to call VirtualFree API!\n"); - PAL_Terminate(); + PAL_TerminateEx(1); return 1; } diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/testinfo.dat deleted file mode 100644 index 7096b5462ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_RESERVE allocation type -=and PAGE_READONLY access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt deleted file mode 100644 index 75295b1f64b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test8 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test8 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp index 9802e7b3a8d..df778dc145a 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test8_paltest_virtualalloc_test8, "filemapping_memmgt/VirtualAlloc/test8/paltest_virtualalloc_test8") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/testinfo.dat deleted file mode 100644 index fe712f77c17..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_RESERVE allocation type -=and PAGE_READWRITE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt deleted file mode 100644 index e819321f398..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualAlloc.cpp -) - -add_executable(paltest_virtualalloc_test9 - ${SOURCES} -) - -add_dependencies(paltest_virtualalloc_test9 coreclrpal) - -target_link_libraries(paltest_virtualalloc_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp index 36d3cf786ab..e6e434c6847 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualAlloc_test9_paltest_virtualalloc_test9, "filemapping_memmgt/VirtualAlloc/test9/paltest_virtualalloc_test9") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/testinfo.dat deleted file mode 100644 index 6ee923e448f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualAlloc -Name = Positive test for VirtualAlloc API -TYPE = DEFAULT -EXE1 = virtualalloc -Description -=Test the VirtualAlloc with MEM_RESERVE allocation type -=and PAGE_EXECUTE access protection diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt deleted file mode 100644 index 72832ce5186..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualFree.cpp -) - -add_executable(paltest_virtualfree_test1 - ${SOURCES} -) - -add_dependencies(paltest_virtualfree_test1 coreclrpal) - -target_link_libraries(paltest_virtualfree_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp index 921457e6d3a..35868de3638 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualFree_test1_paltest_virtualfree_test1, "filemapping_memmgt/VirtualFree/test1/paltest_virtualfree_test1") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/testinfo.dat deleted file mode 100644 index 462b8ffab1c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualFree -Name = Positive test for VirtualFree API -TYPE = DEFAULT -EXE1 = virtualfree -Description -=Test the VirtualFree with MEM_DECOMMIT free -=operation type diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt deleted file mode 100644 index a647cf5d303..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualFree.cpp -) - -add_executable(paltest_virtualfree_test2 - ${SOURCES} -) - -add_dependencies(paltest_virtualfree_test2 coreclrpal) - -target_link_libraries(paltest_virtualfree_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp index fe70d7d0873..d22f7058714 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualFree_test2_paltest_virtualfree_test2, "filemapping_memmgt/VirtualFree/test2/paltest_virtualfree_test2") { int err; LPVOID lpVirtualAddress; @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) if(NULL == lpVirtualAddress) { Fail("\nFailed to call VirtualAlloc API!\n"); - PAL_Terminate(); + PAL_TerminateEx(1); return 1; } @@ -44,7 +44,7 @@ int __cdecl main(int argc, char *argv[]) if(0 == err) { Fail("\nFailed to call VirtualFree API!\n"); - PAL_Terminate(); + PAL_TerminateEx(1); return 1; } diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/testinfo.dat deleted file mode 100644 index 8942d13572a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualFree -Name = Positive test for VirtualFree API -TYPE = DEFAULT -EXE1 = virtualfree -Description -=Test the VirtualFree with MEM_RELEASE free -=operation type diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt deleted file mode 100644 index f77894ea022..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualFree.cpp -) - -add_executable(paltest_virtualfree_test3 - ${SOURCES} -) - -add_dependencies(paltest_virtualfree_test3 coreclrpal) - -target_link_libraries(paltest_virtualfree_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp index 214f96c1d5e..133f82c9f86 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp @@ -16,7 +16,7 @@ #define VIRTUALSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualFree_test3_paltest_virtualfree_test3, "filemapping_memmgt/VirtualFree/test3/paltest_virtualfree_test3") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/testinfo.dat deleted file mode 100644 index 371b964b5a5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualFree -Name = Positive test for VirtualFree API -TYPE = DEFAULT -EXE1 = virtualfree -Description -=Test the VirtualFree with MEM_DECOMMIT|MEM_RELEASE free -=operation type diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/CMakeLists.txt deleted file mode 100644 index ca5ce73dc03..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt deleted file mode 100644 index 522a4cdd498..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test1 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test1 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp index 36e107593c8..be99cc4dd60 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test1_paltest_virtualprotect_test1, "filemapping_memmgt/VirtualProtect/test1/paltest_virtualprotect_test1") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/testinfo.dat deleted file mode 100644 index 51cbd6577f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_READWRITE -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_READWRITE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt deleted file mode 100644 index e5e049c3e67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test2 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test2 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp index 0c95533f554..84978365ab0 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test2_paltest_virtualprotect_test2, "filemapping_memmgt/VirtualProtect/test2/paltest_virtualprotect_test2") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/testinfo.dat deleted file mode 100644 index 12db123a8b6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_EXECUTE -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_EXECUTE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt deleted file mode 100644 index 537e4627d73..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test3 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test3 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp index 86e35ebd074..10f9b13d21e 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test3_paltest_virtualprotect_test3, "filemapping_memmgt/VirtualProtect/test3/paltest_virtualprotect_test3") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/testinfo.dat deleted file mode 100644 index 7817613f95e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_EXECUTE_READ -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_EXECUTE_READ diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt deleted file mode 100644 index 4b5eb6e17f2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test4 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test4 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp index 61275e822b4..0dbc9accbc3 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4, "filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/testinfo.dat deleted file mode 100644 index 19d6b9eb3b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_EXECUTE_READWRITE -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_EXECUTE_READWRITE diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt deleted file mode 100644 index 5f08af8aca2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test6 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test6 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp index 6fa46642901..96c1b65eea2 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test6_paltest_virtualprotect_test6, "filemapping_memmgt/VirtualProtect/test6/paltest_virtualprotect_test6") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/testinfo.dat deleted file mode 100644 index 7df0c9dc9e8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_NOACCESS -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_NOACCESS diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt deleted file mode 100644 index 03ba8a379e1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualProtect.cpp -) - -add_executable(paltest_virtualprotect_test7 - ${SOURCES} -) - -add_dependencies(paltest_virtualprotect_test7 coreclrpal) - -target_link_libraries(paltest_virtualprotect_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp index fb60354c672..5a65cb8dd13 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp @@ -15,7 +15,7 @@ #define REGIONSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualProtect_test7_paltest_virtualprotect_test7, "filemapping_memmgt/VirtualProtect/test7/paltest_virtualprotect_test7") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/testinfo.dat deleted file mode 100644 index 1ba6e796f20..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualProtect -Name = Positive test for VirtualProtect - with PAGE_READONLY -TYPE = DEFAULT -EXE1 = virtualprotect -Description -=Test the VirtualProtect to set new access protection -=as PAGE_READONLY diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt deleted file mode 100644 index 2fef9391094..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - VirtualQuery.cpp -) - -add_executable(paltest_virtualquery_test1 - ${SOURCES} -) - -add_dependencies(paltest_virtualquery_test1 coreclrpal) - -target_link_libraries(paltest_virtualquery_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp index 3a414b36cbf..b11e046d925 100644 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp +++ b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp @@ -15,7 +15,7 @@ #define VIRTUALMEMORYSIZE 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(filemapping_memmgt_VirtualQuery_test1_paltest_virtualquery_test1, "filemapping_memmgt/VirtualQuery/test1/paltest_virtualquery_test1") { int err; LPVOID lpVirtualAddress; diff --git a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/testinfo.dat deleted file mode 100644 index 3d9d01e2e9a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Filemapping_memmgt -Function = VirtualQuery -Name = Positive test for VirtualQuery API -TYPE = DEFAULT -EXE1 = virtualquery -Description -=Test the VirtualQuery to get the virtual page info diff --git a/src/coreclr/src/pal/tests/palsuite/issues.targets b/src/coreclr/src/pal/tests/palsuite/issues.targets new file mode 100644 index 00000000000..fd8a2c08251 --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/issues.targets @@ -0,0 +1,35 @@ +<?xml version="1.0" ?> +<Project DefaultTargets = "ProducePALTestList" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- All OS/Arch/Runtime excludes --> + <ItemGroup> + <ExcludeList Include="file_io/GetFullPathNameA/test3/paltest_getfullpathnamea_test3"> + <Issue>https://github.com/dotnet/runtime/issues/42289</Issue> + </ExcludeList> + </ItemGroup> + + <!-- Target specific excludes --> + <ItemGroup Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetOS)' == 'Linux'"> + <ExcludeList Include="eventprovider/eventprovidertest"> + <Issue>https://github.com/dotnet/runtime/issues/42291</Issue> + </ExcludeList> + </ItemGroup> + <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'Linux'"> + <ExcludeList Include="eventprovider/eventprovidertest"> + <Issue>https://github.com/dotnet/runtime/issues/42291</Issue> + </ExcludeList> + </ItemGroup> + <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'Linux'"> + <ExcludeList Include="eventprovider/eventprovidertest"> + <Issue>https://github.com/dotnet/runtime/issues/42291</Issue> + </ExcludeList> + </ItemGroup> + + <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'OSX'"> + <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1"> + <Issue>https://github.com/dotnet/runtime/issues/7639</Issue> + </ExcludeList> + <ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1"> + <Issue>https://github.com/dotnet/runtime/issues/42292</Issue> + </ExcludeList> + </ItemGroup> +</Project> diff --git a/src/coreclr/src/pal/tests/palsuite/loader/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/CMakeLists.txt deleted file mode 100644 index ffee9ae53b6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(LoadLibraryA) -add_subdirectory(LoadLibraryW) - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/CMakeLists.txt deleted file mode 100644 index b8673b44b0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test5) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt deleted file mode 100644 index d8d84b2e595..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LoadLibraryA.cpp -) - -add_executable(paltest_loadlibrarya_test1 - ${SOURCES} -) - -add_dependencies(paltest_loadlibrarya_test1 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp index 942b540d416..2ab9fe39860 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp @@ -21,7 +21,7 @@ #define ModuleName "rotor_pal.dll" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test1_paltest_loadlibrarya_test1, "loader/LoadLibraryA/test1/paltest_loadlibrarya_test1") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/testinfo.dat deleted file mode 100644 index 946efd2a164..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Positive test for LoadLibraryA API to load Dynamic library module -TYPE = DEFAULT -EXE1 = loadlibrarya -Description -=Test the LoadLibraryA to map module into calling process address space - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt deleted file mode 100644 index f8b83c47f0a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LoadLibraryA.cpp -) - -add_executable(paltest_loadlibrarya_test2 - ${SOURCES} -) - -add_dependencies(paltest_loadlibrarya_test2 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp index e8dc76d9459..7b26fec41db 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test2_paltest_loadlibrarya_test2, "loader/LoadLibraryA/test2/paltest_loadlibrarya_test2") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/testinfo.dat deleted file mode 100644 index b0f3b00d49c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Negative test LoadLibraryA API to load a not exist module -TYPE = DEFAULT -EXE1 = loadlibrarya -Description -=Test the LoadLibraryA to load a not exist module - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt deleted file mode 100644 index b22469ab436..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - loadlibrarya.cpp -) - -add_executable(paltest_loadlibrarya_test3 - ${SOURCES} -) - -add_dependencies(paltest_loadlibrarya_test3 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp index a0732f66f2e..af8782a2801 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp @@ -12,7 +12,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test3_paltest_loadlibrarya_test3, "loader/LoadLibraryA/test3/paltest_loadlibrarya_test3") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/testinfo.dat deleted file mode 100644 index 47a426e0322..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Negative test LoadLibraryA API with a NULL module name -TYPE = DEFAULT -EXE1 = loadlibrarya -Description -=Test the LoadLibraryA to map NULL module into calling -=process address space - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt deleted file mode 100644 index 1957f44fb88..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - loadlibrarya.cpp -) - -add_executable(paltest_loadlibrarya_test5 - ${SOURCES} -) - -add_dependencies(paltest_loadlibrarya_test5 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp index b8216f724f1..690f1ba071c 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test5_paltest_loadlibrarya_test5, "loader/LoadLibraryA/test5/paltest_loadlibrarya_test5") { HMODULE ModuleHandle; char ModuleName[_MAX_FNAME]; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/testinfo.dat deleted file mode 100644 index 975519b5805..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Negative test for LoadLibraryA API by passing a module name without extension but with a trailing dot. -TYPE = DEFAULT -EXE1 = loadlibrarya -Description -=Test the LoadLibraryA by passing a module name without extension -=but with a trailing dot. - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt deleted file mode 100644 index 29f8152b55c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - loadlibrarya.cpp -) - -add_executable(paltest_loadlibrarya_test6 - ${TESTSOURCES} -) - -add_dependencies(paltest_loadlibrarya_test6 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test6 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - dlltest.cpp -) - -add_executable(paltest_loadlibrarya_test6_dlltest - ${HELPERSOURCES} -) - -add_dependencies(paltest_loadlibrarya_test6_dlltest coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test6_dlltest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp index eb2a5e9d40e..d71e0ea85c3 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp @@ -59,7 +59,7 @@ BOOL PALAPI TestDll(HMODULE hLib) return (TRUE); } -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test6_paltest_loadlibrarya_test6, "loader/LoadLibraryA/test6/paltest_loadlibrarya_test6") { HANDLE hFullLib; HANDLE hShortLib; @@ -165,7 +165,7 @@ cleanUpOne: /* Terminate the PAL. */ - PAL_Terminate(); + PAL_TerminateEx(iRetVal); return iRetVal; } diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/testinfo.dat deleted file mode 100644 index a5252b6e389..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test6/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Positive test for LoadLibrary API -TYPE = DEFAULT -EXE1 = loadlibrarya -LIB1 = dlltest -Description -= Positive test the LoadLibrary API. Test will verify -= that it is unable to load the library twice. Once by -= using the full path name and secondly by using the -= short name. - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt deleted file mode 100644 index ae287cc4cc5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LoadLibraryA.cpp -) - -add_executable(paltest_loadlibrarya_test7 - ${SOURCES} -) - -add_dependencies(paltest_loadlibrarya_test7 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp index 99aef0a5173..78948e61698 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp @@ -21,7 +21,7 @@ #define ModuleName "rotor_pal.dll" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test7_paltest_loadlibrarya_test7, "loader/LoadLibraryA/test7/paltest_loadlibrarya_test7") { HMODULE ModuleHandle; HMODULE ReturnHandle; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/testinfo.dat deleted file mode 100644 index c16a7d95a2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test7/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Positive and Negative test for LoadLibraryA API to load Dynamic library module -TYPE = DEFAULT -EXE1 = loadlibrarya -Description -=Test the LoadLibraryA to load multiple times and call unload more times than load - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt deleted file mode 100644 index dd36aa94a8f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - loadlibrarya.cpp -) - -add_executable(paltest_loadlibrarya_test8 - ${TESTSOURCES} -) - -add_dependencies(paltest_loadlibrarya_test8 coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test8 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - dlltest.cpp -) - -add_executable(paltest_loadlibrarya_test8_dlltest - ${HELPERSOURCES} -) - -add_dependencies(paltest_loadlibrarya_test8_dlltest coreclrpal) - -target_link_libraries(paltest_loadlibrarya_test8_dlltest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp index 62197cfedca..b489ef27f96 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp @@ -59,7 +59,7 @@ BOOL PALAPI TestDll(HMODULE hLib) return (TRUE); } -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryA_test8_paltest_loadlibrarya_test8, "loader/LoadLibraryA/test8/paltest_loadlibrarya_test8") { HANDLE hFullLib; HANDLE hShortLib; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/testinfo.dat deleted file mode 100644 index 2d4bf04ec75..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryA/test8/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryA -Name = Positive test for LoadLibrary API -TYPE = DEFAULT -EXE1 = loadlibrarya -LIB1 = dlltest -Description -= Positive test the LoadLibrary API. Test will verify -= that it is able to load the library thrice. Once by -= using the full path name, second by using the -= short name and third by using relative paths - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/CMakeLists.txt deleted file mode 100644 index 2ad6ca8b274..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test5) - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt deleted file mode 100644 index 8adb8a16e09..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - LoadLibraryW.cpp -) - -add_executable(paltest_loadlibraryw_test1 - ${SOURCES} -) - -add_dependencies(paltest_loadlibraryw_test1 coreclrpal) - -target_link_libraries(paltest_loadlibraryw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp index bd680cc5d25..26d6f2adefe 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp @@ -21,7 +21,7 @@ #define ModuleName "rotor_pal.dll" #endif -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryW_test1_paltest_loadlibraryw_test1, "loader/LoadLibraryW/test1/paltest_loadlibraryw_test1") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/testinfo.dat deleted file mode 100644 index f014e6c6833..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryW -Name = Positive test for LoadLibraryW API to load a dynamic library module -TYPE = DEFAULT -EXE1 = loadlibraryw -Description -=Test the LoadLibraryW to map module into calling process address space diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt deleted file mode 100644 index e9a933e6e8f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - loadlibraryw.cpp -) - -add_executable(paltest_loadlibraryw_test2 - ${SOURCES} -) - -add_dependencies(paltest_loadlibraryw_test2 coreclrpal) - -target_link_libraries(paltest_loadlibraryw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp index 097b275906c..f563bb0243f 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryW_test2_paltest_loadlibraryw_test2, "loader/LoadLibraryW/test2/paltest_loadlibraryw_test2") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/testinfo.dat deleted file mode 100644 index 5f0e262a899..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryW -Name = Negative test LoadLibraryW API to load a not exist module -TYPE = DEFAULT -EXE1 = loadlibraryw -Description -=Test the LoadLibraryW to load a not exist module - diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt deleted file mode 100644 index ac6cf05d7b6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - loadlibraryw.cpp -) - -add_executable(paltest_loadlibraryw_test3 - ${SOURCES} -) - -add_dependencies(paltest_loadlibraryw_test3 coreclrpal) - -target_link_libraries(paltest_loadlibraryw_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp index 9f405138c91..4c943597e42 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryW_test3_paltest_loadlibraryw_test3, "loader/LoadLibraryW/test3/paltest_loadlibraryw_test3") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/testinfo.dat deleted file mode 100644 index cfd9c01c3ad..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryW -Name = Negative test loadlibraryw API with a NULL module name -TYPE = DEFAULT -EXE1 = loadlibraryw -Description -=Test the LoadLibraryW with a NULL module name diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt deleted file mode 100644 index 384da59a79a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - loadlibraryw.cpp -) - -add_executable(paltest_loadlibraryw_test5 - ${SOURCES} -) - -add_dependencies(paltest_loadlibraryw_test5 coreclrpal) - -target_link_libraries(paltest_loadlibraryw_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp index 505b6205316..33b46fb0a40 100644 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp +++ b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(loader_LoadLibraryW_test5_paltest_loadlibraryw_test5, "loader/LoadLibraryW/test5/paltest_loadlibraryw_test5") { HMODULE ModuleHandle; int err; diff --git a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/testinfo.dat deleted file mode 100644 index 055c9753f54..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/loader/LoadLibraryW/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Loader -Function = LoadLibraryw -Name = Negative test for LoadLibraryW API by passing a module name without extension but with a trailing dot. -TYPE = DEFAULT -EXE1 = loadlibraryw -Description -=Test the LoadLibraryW by passing a module name without extension -=but with a trailing dot. - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/CMakeLists.txt deleted file mode 100644 index 1faf1db6cec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# TODO: make the following tests compile if they are needed -# add_subdirectory(CompareStringA) -# add_subdirectory(CompareStringW) -# add_subdirectory(GetLocaleInfoW) - -add_subdirectory(GetACP) -add_subdirectory(MultiByteToWideChar) -add_subdirectory(WideCharToMultiByte) - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt deleted file mode 100644 index 0d13e983031..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_comparestringa_test1 - ${SOURCES} -) - -add_dependencies(paltest_comparestringa_test1 coreclrpal) - -target_link_libraries(paltest_comparestringa_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp index 37beece4dfa..91d4ae9da3c 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_CompareStringA_test1_paltest_comparestringa_test1, "locale_info/CompareStringA/test1/paltest_comparestringa_test1") { char str1[] = {'f','o','o',0}; char str2[] = {'f','o','o','x',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/testinfo.dat deleted file mode 100644 index 6bea1c67f24..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringA/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = CompareStringA -Name = Test #1 for CompareStringA -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that CompareStringA returns the correct value and can handle -=invalid parameters. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt deleted file mode 100644 index 24e0a187b02..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_comparestringw_test1 - ${SOURCES} -) - -add_dependencies(paltest_comparestringw_test1 coreclrpal) - -target_link_libraries(paltest_comparestringw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp index 5c3f8b0e42b..d15094609a9 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_CompareStringW_test1_paltest_comparestringw_test1, "locale_info/CompareStringW/test1/paltest_comparestringw_test1") { WCHAR str1[] = {'f','o','o',0}; WCHAR str2[] = {'f','o','o','x',0}; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/testinfo.dat deleted file mode 100644 index 95894f2dfcc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/CompareStringW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = CompareStringW -Name = Test #1 for CompareStringW -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that CompareStringW returns the correct value and can handle -=invalid parameters. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt deleted file mode 100644 index e994d15c0d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_getacp_test1 - ${SOURCES} -) - -add_dependencies(paltest_getacp_test1 coreclrpal) - -target_link_libraries(paltest_getacp_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp index f0f1284d3c7..0f315f2ffe6 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp @@ -19,7 +19,7 @@ #define EXPECTED_CP 65001 -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_GetACP_test1_paltest_getacp_test1, "locale_info/GetACP/test1/paltest_getacp_test1") { int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/testinfo.dat deleted file mode 100644 index 48c2a36859c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetACP/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = GetACP -Name = Test #1 for GetACP -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that GetACP returns code-page 1252. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt deleted file mode 100644 index cca2aa5585c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_getlocaleinfow_test1 - ${SOURCES} -) - -add_dependencies(paltest_getlocaleinfow_test1 coreclrpal) - -target_link_libraries(paltest_getlocaleinfow_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp index 932ddc0313e..13f8176f3e6 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp @@ -39,7 +39,7 @@ LocalInfoType Locales[] = int NumLocales = sizeof(Locales) / sizeof(Locales[0]); -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_GetLocaleInfoW_test1_paltest_getlocaleinfow_test1, "locale_info/GetLocaleInfoW/test1/paltest_getlocaleinfow_test1") { WCHAR buffer[256] = { 0 }; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/testinfo.dat deleted file mode 100644 index be162920357..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = GetLocaleInfoW -Name = Test #1 for GetLocaleInfoW -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that GetLocaleInfoW gives the correction information for LOCALE_NEUTRAL diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt deleted file mode 100644 index 20ccbc36318..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getlocaleinfow_test2 - ${SOURCES} -) - -add_dependencies(paltest_getlocaleinfow_test2 coreclrpal) - -target_link_libraries(paltest_getlocaleinfow_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp index 215ee3e2c7f..5a5a3aa21b3 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_GetLocaleInfoW_test2_paltest_getlocaleinfow_test2, "locale_info/GetLocaleInfoW/test2/paltest_getlocaleinfow_test2") { WCHAR buffer[256] = { 0 }; int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/testinfo.dat deleted file mode 100644 index 4f8b045fc02..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = GetLocaleInfoW -Name = Test #2 for GetLocaleInfoW -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that GetLocaleInfoW will correctly return the amount of -=buffer space required. Also tests that it correctly handles a -=buffer of insufficient space. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/CMakeLists.txt deleted file mode 100644 index 03456f5e293..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt deleted file mode 100644 index 24c812e6727..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_multibytetowidechar_test1 - ${SOURCES} -) - -add_dependencies(paltest_multibytetowidechar_test1 coreclrpal) - -target_link_libraries(paltest_multibytetowidechar_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp index a10c00d3ef2..bbd8ab11c00 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp @@ -19,7 +19,7 @@ * with CP_ACP, and that dwFlags will be 0. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_MultiByteToWideChar_test1_paltest_multibytetowidechar_test1, "locale_info/MultiByteToWideChar/test1/paltest_multibytetowidechar_test1") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/testinfo.dat deleted file mode 100644 index 0548926e846..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = MultiByteToWideChar -Name = Test #1 for MultiByteToWideChar -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests MultiByteToWideChar with all the ASCII characters (0-127). -=Also tests that WideCharToMultiByte handles different buffer -=lengths correctly (0, -1, and a valid length) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt deleted file mode 100644 index e60ae207c94..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_multibytetowidechar_test2 - ${SOURCES} -) - -add_dependencies(paltest_multibytetowidechar_test2 coreclrpal) - -target_link_libraries(paltest_multibytetowidechar_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp index e4649b116da..e98b03db070 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp @@ -18,7 +18,7 @@ * with CP_ACP, and that dwFlags will be 0. */ -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_MultiByteToWideChar_test2_paltest_multibytetowidechar_test2, "locale_info/MultiByteToWideChar/test2/paltest_multibytetowidechar_test2") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/testinfo.dat deleted file mode 100644 index 84d190a8fab..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = MultiByteToWideChar -Name = Test #2 for MultiByteToWideChar -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that MultiByteToWideChar respects the length of the wide -=character string. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt deleted file mode 100644 index e6397e5a4a5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_multibytetowidechar_test3 - ${SOURCES} -) - -add_dependencies(paltest_multibytetowidechar_test3 coreclrpal) - -target_link_libraries(paltest_multibytetowidechar_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp index 5553e73cdaf..2e36b3e3a14 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_MultiByteToWideChar_test3_paltest_multibytetowidechar_test3, "locale_info/MultiByteToWideChar/test3/paltest_multibytetowidechar_test3") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/testinfo.dat deleted file mode 100644 index 603565d64a1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = MultiByteToWideChar -Name = Test #3 for MultiByteToWideChar -TYPE = DEFAULT -EXE1 = test3 -Description -=Tests that MultiByteToWideChar correctly handles the following -=error conditions: insufficient buffer space, invalid code pages, -=and invalid flags. - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt deleted file mode 100644 index feb8d69756d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_multibytetowidechar_test4 - ${SOURCES} -) - -add_dependencies(paltest_multibytetowidechar_test4 coreclrpal) - -target_link_libraries(paltest_multibytetowidechar_test4 - ${COMMON_TEST_LIBRARIES} -)
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp index 758d3c875cb..cab71f15e70 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_MultiByteToWideChar_test4_paltest_multibytetowidechar_test4, "locale_info/MultiByteToWideChar/test4/paltest_multibytetowidechar_test4") { int ret; int ret2; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/testinfo.dat deleted file mode 100644 index e95f4139046..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) Microsoft Corporation. All rights reserved. -# - -Version = 1.0 -Section = Locale Information -Function = MultiByteToWideChar -Name = Test #4 for MultiByteToWideChar -TYPE = DEFAULT -EXE1 = test4 -Description -=Tests MultiByteToWideChar with UTF-8 encoded strings -=containing various corner cases
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/CMakeLists.txt deleted file mode 100644 index 7db3404bbe5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt deleted file mode 100644 index a55f4e82fdd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_widechartomultibyte_test1 - ${SOURCES} -) - -add_dependencies(paltest_widechartomultibyte_test1 coreclrpal) - -target_link_libraries(paltest_widechartomultibyte_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp index 3bdc124e9f9..e8197b8c11b 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_WideCharToMultiByte_test1_paltest_widechartomultibyte_test1, "locale_info/WideCharToMultiByte/test1/paltest_widechartomultibyte_test1") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/testinfo.dat deleted file mode 100644 index 518a52988be..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = WideCharToMultiByte -Name = Test #1 for WideCharToMultiByte -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests WideCharToMultiByte with all the ASCII characters (0-127). -=Also tests that WideCharToMultiByte handles different buffer -=lengths correctly (0, -1, and a valid length) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt deleted file mode 100644 index 941f0f50e22..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_widechartomultibyte_test2 - ${SOURCES} -) - -add_dependencies(paltest_widechartomultibyte_test2 coreclrpal) - -target_link_libraries(paltest_widechartomultibyte_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp index f4cee255adc..611b1b92b1b 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_WideCharToMultiByte_test2_paltest_widechartomultibyte_test2, "locale_info/WideCharToMultiByte/test2/paltest_widechartomultibyte_test2") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/testinfo.dat deleted file mode 100644 index 3b29e9514ac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = WideCharToMultiByte -Name = Test #2 for WideCharToMultiByte -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that WideCharToMultiByte respects the length of the wide -=character string. diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt deleted file mode 100644 index d2719ad75d3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_widechartomultibyte_test3 - ${SOURCES} -) - -add_dependencies(paltest_widechartomultibyte_test3 coreclrpal) - -target_link_libraries(paltest_widechartomultibyte_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp index 46c7f47fa9a..3bb816dcb88 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_WideCharToMultiByte_test3_paltest_widechartomultibyte_test3, "locale_info/WideCharToMultiByte/test3/paltest_widechartomultibyte_test3") { char mbStr[128]; WCHAR wideStr[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/testinfo.dat deleted file mode 100644 index 9ecf1f29309..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = WideCharToMultiByte -Name = Test #3 for WideCharToMultiByte -TYPE = DEFAULT -EXE1 = test3 -Description -=Tests that WideCharToMultiByte correctly handles the following -=error conditions: insufficient buffer space and invalid code pages. - diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt deleted file mode 100644 index 43bfbd062e2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_widechartomultibyte_test4 - ${SOURCES} -) - -add_dependencies(paltest_widechartomultibyte_test4 coreclrpal) - -target_link_libraries(paltest_widechartomultibyte_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp index 7c81884d73d..19b5796bf1f 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp @@ -59,7 +59,7 @@ TestWideCharToMultiByte( return testStatus; } -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_WideCharToMultiByte_test4_paltest_widechartomultibyte_test4, "locale_info/WideCharToMultiByte/test4/paltest_widechartomultibyte_test4") { int testStatus = PASS; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/testinfo.dat deleted file mode 100644 index fd7575e8f62..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Locale Information -Function = WideCharToMultiByte -Name = Test #4 for WideCharToMultiByte -TYPE = DEFAULT -EXE1 = test4 -Description -=Tests that WideCharToMultiByte correctly handles WC_NO_BEST_FIT_CHARS diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt deleted file mode 100644 index 5906634768c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_widechartomultibyte_test5 - ${SOURCES} -) - -add_dependencies(paltest_widechartomultibyte_test5 coreclrpal) - -target_link_libraries(paltest_widechartomultibyte_test5 - ${COMMON_TEST_LIBRARIES} -)
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp index c01bbe0756c..bf2dabedefa 100644 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(locale_info_WideCharToMultiByte_test5_paltest_widechartomultibyte_test5, "locale_info/WideCharToMultiByte/test5/paltest_widechartomultibyte_test5") { int ret; int ret2; diff --git a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/testinfo.dat deleted file mode 100644 index 485d9401e5e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) Microsoft Corporation. All rights reserved. -# - -Version = 1.0 -Section = Locale Information -Function = WideCharToMultiByte -Name = Test #5 for WideCharToMultiByte -TYPE = DEFAULT -EXE1 = test5 -Description -=Tests WideCharToMultiByte conversion to UTF-8 -=containing various corner cases
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/CMakeLists.txt deleted file mode 100644 index 2ff735b2322..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_cgroup_test1 - ${SOURCES} -) - -add_dependencies(paltest_cgroup_test1 coreclrpal) - -target_link_libraries(paltest_cgroup_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/test.cpp index d44c7a753a2..8b1ee94ba31 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/test.cpp @@ -22,7 +22,7 @@ #include <palsuite.h> -int __cdecl main(int argc,char *argv[]) +PALTEST(miscellaneous_CGroup_test1_paltest_cgroup_test1, "miscellaneous/CGroup/test1/paltest_cgroup_test1") { /* diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/testinfo.dat deleted file mode 100644 index 672a583a78e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CGroup/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = CGroup -Name = Positive Test for CGroup -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if Cgroup memory limit works properly diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt deleted file mode 100644 index a0518e239b1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -add_subdirectory(CGroup) -add_subdirectory(CloseHandle) -add_subdirectory(CreatePipe) -add_subdirectory(FlushInstructionCache) -add_subdirectory(FormatMessageW) -add_subdirectory(FreeEnvironmentStringsW) -add_subdirectory(GetCommandLineW) -add_subdirectory(GetEnvironmentStringsW) -add_subdirectory(GetEnvironmentVariableA) -add_subdirectory(GetEnvironmentVariableW) -add_subdirectory(GetLastError) -add_subdirectory(GetSystemInfo) -add_subdirectory(GlobalMemoryStatusEx) -add_subdirectory(GetTickCount) -add_subdirectory(InterlockedBit) -add_subdirectory(InterlockedCompareExchange) -add_subdirectory(InterlockedCompareExchange64) -add_subdirectory(InterlockedCompareExchangePointer) -add_subdirectory(InterlockedDecrement) -add_subdirectory(InterlockedDecrement64) -add_subdirectory(InterlockedExchange) -add_subdirectory(InterlockedExchange64) -add_subdirectory(InterLockedExchangeAdd) -add_subdirectory(InterlockedExchangePointer) -add_subdirectory(InterlockedIncrement) -add_subdirectory(InterlockedIncrement64) -add_subdirectory(queryperformancecounter) -add_subdirectory(queryperformancefrequency) -add_subdirectory(SetEnvironmentVariableA) -add_subdirectory(SetEnvironmentVariableW) -add_subdirectory(SetLastError) -add_subdirectory(_i64tow) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt deleted file mode 100644 index 34fbb1200e2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_charnexta_test1 - ${SOURCES} -) - -add_dependencies(paltest_charnexta_test1 coreclrpal) - -target_link_libraries(paltest_charnexta_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt deleted file mode 100644 index 1203e12752c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_charnexta_test2 - ${SOURCES} -) - -add_dependencies(paltest_charnexta_test2 coreclrpal) - -target_link_libraries(paltest_charnexta_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt deleted file mode 100644 index 886d89da1e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_charnextexa_test1 - ${SOURCES} -) - -add_dependencies(paltest_charnextexa_test1 coreclrpal) - -target_link_libraries(paltest_charnextexa_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt deleted file mode 100644 index 15278efdc35..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_charnextexa_test2 - ${SOURCES} -) - -add_dependencies(paltest_charnextexa_test2 coreclrpal) - -target_link_libraries(paltest_charnextexa_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt deleted file mode 100644 index 0715ea025b8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_closehandle_test1 - ${SOURCES} -) - -add_dependencies(paltest_closehandle_test1 coreclrpal) - -target_link_libraries(paltest_closehandle_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp index ad1bed2ab6f..a45322ad2ef 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_CloseHandle_test1_paltest_closehandle_test1, "miscellaneous/CloseHandle/test1/paltest_closehandle_test1") { HANDLE FileHandle = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/testinfo.dat deleted file mode 100644 index 3ac8f45d796..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = CloseHandle -Name = Positive Test for CloseHandle -TYPE = DEFAULT -EXE1 = test -Description -= Open a file to get a handle, and then close the file using CloseHandle - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt deleted file mode 100644 index ae5b509ed53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_closehandle_test2 - ${SOURCES} -) - -add_dependencies(paltest_closehandle_test2 coreclrpal) - -target_link_libraries(paltest_closehandle_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp index 70aa9c4bcef..48188be27a0 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_CloseHandle_test2_paltest_closehandle_test2, "miscellaneous/CloseHandle/test2/paltest_closehandle_test2") { HANDLE SomeHandle = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/testinfo.dat deleted file mode 100644 index a69f5d5b051..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = CloseHandle -Name = Positive Test for CloseHandle -TYPE = DEFAULT -EXE1 = test -Description -= Attempt to close an unintialized HANDLE, should be unable to do this. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt deleted file mode 100644 index 8242bbd1247..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_createpipe_test1 - ${SOURCES} -) - -add_dependencies(paltest_createpipe_test1 coreclrpal) - -target_link_libraries(paltest_createpipe_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp index df2b8f66717..f0f686924cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp @@ -20,9 +20,9 @@ #include <palsuite.h> -const char* cTestString = "one fish, two fish, red fish, blue fish."; +#define cTestString "one fish, two fish, read fish, blue fish." -int __cdecl main(int argc, char **argv) +PALTEST(miscellaneous_CreatePipe_test1_paltest_createpipe_test1, "miscellaneous/CreatePipe/test1/paltest_createpipe_test1") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/testinfo.dat deleted file mode 100644 index d36f44faf47..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = CreatePipe -Name = Test for CreatePipe -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the CreatePipe function. -= This test will create two pipes, a read and a write. Once -= the pipes have been created, they will be tested by writing -= and then reading, then comparing the results. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt deleted file mode 100644 index c3e8011077f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_flushinstructioncache_test1 - ${SOURCES} -) - -add_dependencies(paltest_flushinstructioncache_test1 coreclrpal) - -target_link_libraries(paltest_flushinstructioncache_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp index 1ff3d9e898a..c14915d76d5 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp @@ -47,7 +47,7 @@ void DoTest(void *Buffer, int Size, int Expected) } -int __cdecl main(int argc,char *argv[]) +PALTEST(miscellaneous_FlushInstructionCache_test1_paltest_flushinstructioncache_test1, "miscellaneous/FlushInstructionCache/test1/paltest_flushinstructioncache_test1") { char ValidPtr[256]; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/testinfo.dat deleted file mode 100644 index bb2d259cdf0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FlushInstructionCache -Name = Positive Test #1 for FlushInstructionCache -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that FlushInstructionCache returns the correct value for a -=number of different inputs. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt deleted file mode 100644 index 191da48fff9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test1 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test1 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp index 05b4bca36d3..9c195535500 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_FormatMessageW_test1_paltest_formatmessagew_test1, "miscellaneous/FormatMessageW/test1/paltest_formatmessagew_test1") +{ WCHAR TheString[] = {'P','a','l',' ','T','e','s','t','\0'}; WCHAR OutBuffer[128]; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/testinfo.dat deleted file mode 100644 index c057584ef98..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= Test a very simple case -- basically just copy a string into a buffer, -= no formatting. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt deleted file mode 100644 index 5f0f6cefe53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test2 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test2 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp index a4a9a4d00b0..67981857963 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -WCHAR OutBuffer[1024]; +WCHAR OutBuffer_FormatMessageW_test2[1024]; /* Pass this test the string "INSERT" and it will succeed */ @@ -24,14 +24,14 @@ int test1(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -46,12 +46,12 @@ int test1(int num, ...) } - if(memcmp(OutBuffer, convert("Pal INSERT Testing"), - wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal INSERT Testing"), + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal INSERT " "Testing' but '%s' was returned.", - convertC(OutBuffer)); + convertC(OutBuffer_FormatMessageW_test2)); } @@ -68,14 +68,14 @@ int test2(int num, ...) va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -89,10 +89,10 @@ int test2(int num, ...) " with the 'i' formatter."); } - if(memcmp(OutBuffer, convert("Pal 40 Testing"),wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 40 Testing"),wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal 40 Testing' " - "but '%s' was returned.", convertC(OutBuffer)); + "but '%s' was returned.", convertC(OutBuffer_FormatMessageW_test2)); } return PASS; } @@ -105,13 +105,13 @@ int test3(int num, ...) { int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -125,10 +125,10 @@ int test3(int num, ...) { " with the 'c' formatter."); } - if(memcmp(OutBuffer, convert("Pal a Testing"),wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal a Testing"),wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal a Testing' " - "but '%s' was returned.", convertC(OutBuffer)); + "but '%s' was returned.", convertC(OutBuffer_FormatMessageW_test2)); } @@ -143,13 +143,13 @@ int test4(int num, ...) { int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -163,10 +163,10 @@ int test4(int num, ...) { " with the 'C' formatter."); } - if(memcmp(OutBuffer, convert("Pal a Testing"),wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal a Testing"),wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal a Testing' " - "but '%s' was returned.",convertC(OutBuffer)); + "but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } return PASS; @@ -181,14 +181,14 @@ int test5(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -203,10 +203,10 @@ int test5(int num, ...) } - if(memcmp(OutBuffer, convert("Pal 57 Testing"),wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 57 Testing"),wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal 57 Testing' " - "but '%s' was returned.",convertC(OutBuffer)); + "but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } @@ -221,14 +221,14 @@ int test6(int num, ...) { int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -243,11 +243,11 @@ int test6(int num, ...) { } - if(memcmp(OutBuffer, convert("Pal a and b Testing"), - wcslen(OutBuffer)*2+2) != 0) + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal a and b Testing"), + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal a and b " - "Testing' but '%s' was returned.", convertC(OutBuffer)); + "Testing' but '%s' was returned.", convertC(OutBuffer_FormatMessageW_test2)); } @@ -263,14 +263,14 @@ int test7(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -285,12 +285,12 @@ int test7(int num, ...) } - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 90 and foo and bar Testing"), - wcslen(OutBuffer)*2+2) != 0) + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal 90 and foo " - "and bar Testing' but '%s' was returned.",convertC(OutBuffer)); + "and bar Testing' but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } return PASS; @@ -306,14 +306,14 @@ int test8(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -328,12 +328,12 @@ int test8(int num, ...) } - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal a and b and 50 and 100 Testing"), - wcslen(OutBuffer)*2+2) != 0) + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal a and b and 50" - " and 100 Testing' but '%s' was returned.",convertC(OutBuffer)); + " and 100 Testing' but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } @@ -350,13 +350,13 @@ int test9(int num, ...) { int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -371,12 +371,12 @@ int test9(int num, ...) { } - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal foo and bar and 56 Testing"), - wcslen(OutBuffer)*2+2) != 0) + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal foo and bar " - "and 56 Testing' but '%s' was returned.",convertC(OutBuffer)); + "and 56 Testing' but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } @@ -392,13 +392,13 @@ int test10(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -413,12 +413,12 @@ int test10(int num, ...) } - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 123ab and 123CD Testing"), - wcslen(OutBuffer)*2+2) != 0) + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal 123ab and " - "123CD Testing' but '%s' was returned.", convertC(OutBuffer)); + "123CD Testing' but '%s' was returned.", convertC(OutBuffer_FormatMessageW_test2)); } @@ -434,14 +434,14 @@ int test11(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -461,31 +461,31 @@ int test11(int num, ...) */ #if defined(HOST_64BIT) Trace("Testing for 64 Bit Platforms \n"); - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 00000000000123AB and foo Testing"), - wcslen(OutBuffer)*2+2) != 0 && + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0 && /* BSD style */ - memcmp( OutBuffer, + memcmp( OutBuffer_FormatMessageW_test2, convert( "Pal 0x123ab and foo Testing" ), - wcslen(OutBuffer)*2+2 ) != 0 ) + wcslen(OutBuffer_FormatMessageW_test2)*2+2 ) != 0 ) { Fail("ERROR: The formated string should have been 'Pal 000123AB and " - "foo Testing' but '%s' was returned.",convertC(OutBuffer)); + "foo Testing' but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } #else Trace("Testing for Non 64 Bit Platforms \n"); - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 000123AB and foo Testing"), - wcslen(OutBuffer)*2+2) != 0 && + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0 && /* BSD style */ - memcmp( OutBuffer, + memcmp( OutBuffer_FormatMessageW_test2, convert( "Pal 0x123ab and foo Testing" ), - wcslen(OutBuffer)*2+2 ) != 0 ) + wcslen(OutBuffer_FormatMessageW_test2)*2+2 ) != 0 ) { Fail("ERROR: The formated string should have been 'Pal 000123AB and " - "foo Testing' but '%s' was returned.",convertC(OutBuffer)); + "foo Testing' but '%s' was returned.",convertC(OutBuffer_FormatMessageW_test2)); } @@ -504,14 +504,14 @@ int test12(int num, ...) int ReturnResult; va_list TheList; va_start(TheList,num); - memset( OutBuffer, 0, 1024 * sizeof(OutBuffer[0]) ); + memset( OutBuffer_FormatMessageW_test2, 0, 1024 * sizeof(OutBuffer_FormatMessageW_test2[0]) ); ReturnResult = FormatMessage( FORMAT_MESSAGE_FROM_STRING, /* source and processing options */ TheString, /* message source */ 0, /* message identifier */ 0, /* language identifier */ - OutBuffer, /* message buffer */ + OutBuffer_FormatMessageW_test2, /* message buffer */ 1024, /* maximum size of message buffer */ &TheList /* array of message inserts */ ); @@ -526,20 +526,20 @@ int test12(int num, ...) } - if(memcmp(OutBuffer, + if(memcmp(OutBuffer_FormatMessageW_test2, convert("Pal 100 and 123ab and 123CD Testing"), - wcslen(OutBuffer)*2+2) != 0) + wcslen(OutBuffer_FormatMessageW_test2)*2+2) != 0) { Fail("ERROR: The formated string should have been 'Pal 100 and " "123ab and 123CD Testing' but '%s' was returned.", - convertC(OutBuffer)); + convertC(OutBuffer_FormatMessageW_test2)); } return PASS; } -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_FormatMessageW_test2_paltest_formatmessagew_test2, "miscellaneous/FormatMessageW/test2/paltest_formatmessagew_test2") { WCHAR szwInsert[] = {'I','N','S','E','R','T','\0'}; WCHAR szwFoo[] = {'f','o','o','\0'}; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/testinfo.dat deleted file mode 100644 index dc571372828..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= A collection of tests to check and make sure all the standard formatters work. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt deleted file mode 100644 index 98532f3ddb1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test3 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test3 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp index e46214f8415..47474477c87 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp @@ -13,10 +13,10 @@ #define UNICODE #include <palsuite.h> -WCHAR OutBuffer[1024]; -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_FormatMessageW_test3_paltest_formatmessagew_test3, "miscellaneous/FormatMessageW/test3/paltest_formatmessagew_test3") { + WCHAR OutBuffer[1024]; WCHAR * TheString; WCHAR * CorrectString; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/testinfo.dat deleted file mode 100644 index 704b4c29c49..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= Test to ensure the IGNORE_INSERTS flag works properly. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt deleted file mode 100644 index 1a0dcad8ee2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test4 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test4 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp index 7ebe91de5ef..0760a849550 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp @@ -13,10 +13,10 @@ #define UNICODE #include <palsuite.h> -WCHAR OutBuffer[1024]; -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_FormatMessageW_test4_paltest_formatmessagew_test4, "miscellaneous/FormatMessageW/test4/paltest_formatmessagew_test4") { + WCHAR OutBuffer[1024]; WCHAR * TheString; WCHAR* TheArray[3]; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/testinfo.dat deleted file mode 100644 index dbe71255aaf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= Test to ensure the FORMAT_MESSAGE_ARGUMENT_ARRAY flag works properly. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt deleted file mode 100644 index c0c69e81921..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test5 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test5 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp index a27f42ebcf7..b7a21c496e8 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp @@ -14,7 +14,8 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_FormatMessageW_test5_paltest_formatmessagew_test5, "miscellaneous/FormatMessageW/test5/paltest_formatmessagew_test5") +{ WCHAR * TheString; LPWSTR OutBuffer; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/testinfo.dat deleted file mode 100644 index 39e525c759a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= Test to ensure the FORMAT_MESSAGE_ALLOCATE_BUFFER flag works properly. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt deleted file mode 100644 index cdbd9be0daf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_formatmessagew_test6 - ${SOURCES} -) - -add_dependencies(paltest_formatmessagew_test6 coreclrpal) - -target_link_libraries(paltest_formatmessagew_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp index 510946421df..b16b0ea2775 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp @@ -15,7 +15,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_FormatMessageW_test6_paltest_formatmessagew_test6, "miscellaneous/FormatMessageW/test6/paltest_formatmessagew_test6") +{ LPWSTR OutBuffer; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/testinfo.dat deleted file mode 100644 index 6ca71938f15..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FormatMessageW -Name = Positive test of FormatMessageW -TYPE = DEFAULT -EXE1 = test -Description -= Test to ensure the FORMAT_SYSTEM_MESSAGE flag works properly. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt deleted file mode 100644 index 059e1bfc1ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_freeenvironmentstringsw_test1 - ${SOURCES} -) - -add_dependencies(paltest_freeenvironmentstringsw_test1 coreclrpal) - -target_link_libraries(paltest_freeenvironmentstringsw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp index a8d37180070..1d90fdd1572 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_FreeEnvironmentStringsW_test1_paltest_freeenvironmentstringsw_test1, "miscellaneous/FreeEnvironmentStringsW/test1/paltest_freeenvironmentstringsw_test1") { LPWSTR CapturedEnvironment = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/testinfo.dat deleted file mode 100644 index 33267b23b03..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FreeEnvironmentStringsW -Name = Return value test for FreeEnvironmentStringsW -TYPE = DEFAULT -EXE1 = test -Description -= Get a set of strings and then free it to see if function returns success - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt deleted file mode 100644 index b47c4f012bb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_freeenvironmentstringsw_test2 - ${SOURCES} -) - -add_dependencies(paltest_freeenvironmentstringsw_test2 coreclrpal) - -target_link_libraries(paltest_freeenvironmentstringsw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp index c961ee62502..1bf34eda6ec 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_FreeEnvironmentStringsW_test2_paltest_freeenvironmentstringsw_test2, "miscellaneous/FreeEnvironmentStringsW/test2/paltest_freeenvironmentstringsw_test2") { WCHAR CapturedEnvironment[] = {'T','E','S','T','\0'}; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/testinfo.dat deleted file mode 100644 index e9ee3e4a578..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = FreeEnvironmentStringsW -Name = Positive Return value test for FreeEnvironmentStringsW -TYPE = DEFAULT -EXE1 = test -Description -= Ensure that FreeEnvironmentStringsW returns success when passed pointers -= that don't point to an environment block. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt deleted file mode 100644 index c60f7101c56..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getcommandlinew_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcommandlinew_test1 coreclrpal) - -target_link_libraries(paltest_getcommandlinew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp index 9604138a5ec..eca5a53a319 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetCommandLineW_test1_paltest_getcommandlinew_test1, "miscellaneous/GetCommandLineW/test1/paltest_getcommandlinew_test1") { LPWSTR TheResult = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/testinfo.dat deleted file mode 100644 index 19fba6d0667..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetCommandLineW -Name = Positive test for GetCommandLineW -TYPE = DEFAULT -EXE1 = test -Description -= Ensure that this function returns the correct CommandLine - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt deleted file mode 100644 index dbeaffc635a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentstringsw_test1 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentstringsw_test1 coreclrpal) - -target_link_libraries(paltest_getenvironmentstringsw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp index 9cdabf2d525..3d76f17bb46 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp @@ -15,7 +15,8 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetEnvironmentStringsW_test1_paltest_getenvironmentstringsw_test1, "miscellaneous/GetEnvironmentStringsW/test1/paltest_getenvironmentstringsw_test1") +{ LPWSTR CapturedEnvironmentStrings = NULL; LPWSTR EnviroStringReturned = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/testinfo.dat deleted file mode 100644 index 3e7c3e6ffbd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentStringsW -Name = Test for correct return of GetEnvironmentStringsW -TYPE = DEFAULT -EXE1 = test -Description -= Get a set of strings, and check to make sure it contains a predetermined -= string that was placed there. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt deleted file mode 100644 index e434fd1b719..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablea_test1 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test1 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp index 35edd29a6db..165ebdaeca4 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetEnvironmentVariableA_test1_paltest_getenvironmentvariablea_test1, "miscellaneous/GetEnvironmentVariableA/test1/paltest_getenvironmentvariablea_test1") +{ /* Define some buffers needed for the function */ char * pResultBuffer = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/testinfo.dat deleted file mode 100644 index 104eab1bab3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Return value test for GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test -Description -= Assign a properly sized buffer and get an environment variable, check to -= ensure it returns the correct values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt deleted file mode 100644 index cdfa4c92087..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablea_test2 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test2 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp index ac0b9ebb02a..71561403fff 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp @@ -16,7 +16,8 @@ #define SMALL_BUFFER_SIZE 1 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetEnvironmentVariableA_test2_paltest_getenvironmentvariablea_test2, "miscellaneous/GetEnvironmentVariableA/test2/paltest_getenvironmentvariablea_test2") +{ /* A place to stash the returned values */ int ReturnValueForSmallBuffer = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/testinfo.dat deleted file mode 100644 index 55150d5dc67..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Return value test on GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test -Description -= Pass a small buffer to GetEnvironmentVariableA -= to ensure it returns the size it requires. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt deleted file mode 100644 index 20dd149cce9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablea_test3 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test3 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp index 96a2a93fd24..87920f66a37 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp @@ -17,7 +17,7 @@ #define BUFFER_SIZE 5000 #define SMALL_BUFFER_SIZE 5 -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableA_test3_paltest_getenvironmentvariablea_test3, "miscellaneous/GetEnvironmentVariableA/test3/paltest_getenvironmentvariablea_test3") { int ReturnValueForNonExisting = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/testinfo.dat deleted file mode 100644 index 7f049668700..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Return value test for GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test -Description -= Pass a nonexisting environment variable and a null to the function -= to check return values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt deleted file mode 100644 index 14dc464b278..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablea_test4 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test4 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp index 35431e074d3..b8e5607af90 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp @@ -18,7 +18,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetEnvironmentVariableA_test4_paltest_getenvironmentvariablea_test4, "miscellaneous/GetEnvironmentVariableA/test4/paltest_getenvironmentvariablea_test4") +{ /* Define some buffers needed for the function */ char * pResultBuffer = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/testinfo.dat deleted file mode 100644 index d0e01fd76cc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Positive Test for GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test -Description -= Set an Environment Variable, then use GetEnvironmentVariable -= to retrieve it ensure that it retrieves properly. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt deleted file mode 100644 index d5ceb8cf577..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_getenvironmentvariablea_test5 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test5 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp index e6557354227..347826b7e4e 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableA_test5_paltest_getenvironmentvariablea_test5, "miscellaneous/GetEnvironmentVariableA/test5/paltest_getenvironmentvariablea_test5") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/testinfo.dat deleted file mode 100644 index 91baadc4c53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Positive Test for GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test5 -Description -= Set environment variables that differ only in case -= and verify that on BSD they return two different -= values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt deleted file mode 100644 index e9ca7390c8d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_getenvironmentvariablea_test6 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablea_test6 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablea_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp index 2f1107fdb4f..81b2453c4f6 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableA_test6_paltest_getenvironmentvariablea_test6, "miscellaneous/GetEnvironmentVariableA/test6/paltest_getenvironmentvariablea_test6") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/testinfo.dat deleted file mode 100644 index 6f1952b4798..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableA -Name = Positive Test for GetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test6 -Description -= Set an Environment Variable, then use GetEnvironmentVariable -= to retrieve the Variable, using a name that differs only in -= Case. In Windows this should not affect the return value -= of the function. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt deleted file mode 100644 index 2ce264d3396..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablew_test1 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test1 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp index 50c40afc7a7..115486229f1 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp @@ -13,7 +13,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableW_test1_paltest_getenvironmentvariablew_test1, "miscellaneous/GetEnvironmentVariableW/test1/paltest_getenvironmentvariablew_test1") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/testinfo.dat deleted file mode 100644 index 40adb9cd4da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Return value test for GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Assign a properly sized buffer and get an environment variable, -= check to ensure it returns the correct values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt deleted file mode 100644 index edcf8db43ca..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablew_test2 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test2 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp index b4308a8bd5c..444db4ec316 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp @@ -16,7 +16,7 @@ #define SMALL_BUFFER_SIZE 1 -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableW_test2_paltest_getenvironmentvariablew_test2, "miscellaneous/GetEnvironmentVariableW/test2/paltest_getenvironmentvariablew_test2") { WCHAR pSmallBuffer[SMALL_BUFFER_SIZE]; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/testinfo.dat deleted file mode 100644 index 0fc404753f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Return value test on GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Pass a small buffer to GetEnvironmentVariableW -= to ensure it returns the size it requires. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt deleted file mode 100644 index da0aa869022..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablew_test3 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test3 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp index d489996f64a..8d1c8f8577a 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp @@ -16,7 +16,7 @@ #define BUFFER_SIZE 5000 #define SMALL_BUFFER_SIZE 5 -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableW_test3_paltest_getenvironmentvariablew_test3, "miscellaneous/GetEnvironmentVariableW/test3/paltest_getenvironmentvariablew_test3") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/testinfo.dat deleted file mode 100644 index 86464a2f3a0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Return value test for GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Pass a nonexisting environment variable and a null to the function -= to check return values. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt deleted file mode 100644 index f2b472c8cec..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getenvironmentvariablew_test4 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test4 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp index 47f1c217b58..481252be383 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp @@ -16,7 +16,8 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetEnvironmentVariableW_test4_paltest_getenvironmentvariablew_test4, "miscellaneous/GetEnvironmentVariableW/test4/paltest_getenvironmentvariablew_test4") +{ /* Define some buffers needed for the function */ WCHAR * pResultBuffer = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/testinfo.dat deleted file mode 100644 index ae1965ca49f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Positive Test for GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Set an Environment Variable, then use GetEnvironmentVariable -= to retrieve it -- ensure that it retrieves properly. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt deleted file mode 100644 index 37884eecacc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_getenvironmentvariablew_test5 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test5 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp index d0932ae184f..3601d22a5f4 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableW_test5_paltest_getenvironmentvariablew_test5, "miscellaneous/GetEnvironmentVariableW/test5/paltest_getenvironmentvariablew_test5") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/testinfo.dat deleted file mode 100644 index b53bf6a81e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Positive Test for GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test5 -Description -= Set an Environment Variable, then use GetEnvironmentVariable -= to retrieve it. Then set another environment variable that differs -= from the original variable only by case and verify that -= GetEnvironmnetVariable returns the correct value. - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt deleted file mode 100644 index 8a780b8bacb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_getenvironmentvariablew_test6 - ${SOURCES} -) - -add_dependencies(paltest_getenvironmentvariablew_test6 coreclrpal) - -target_link_libraries(paltest_getenvironmentvariablew_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp index abd9fc26702..533f8e9f0d0 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_GetEnvironmentVariableW_test6_paltest_getenvironmentvariablew_test6, "miscellaneous/GetEnvironmentVariableW/test6/paltest_getenvironmentvariablew_test6") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/testinfo.dat deleted file mode 100644 index 102cf8edcac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetEnvironmentVariableW -Name = Positive Test for GetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test6 -Description -= Set an Environment Variable, then use GetEnvironmentVariable -= to retrieve the Variable, using a name that differs only in -= Case. In Windows this should not affect the return value -= of the function. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt deleted file mode 100644 index 28ca478f2b4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getlasterror_test1 - ${SOURCES} -) - -add_dependencies(paltest_getlasterror_test1 coreclrpal) - -target_link_libraries(paltest_getlasterror_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp index c106f9c9030..159c9f197f4 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp @@ -34,7 +34,8 @@ static void test(DWORD error ) } -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetLastError_test1_paltest_getlasterror_test1, "miscellaneous/GetLastError/test1/paltest_getlasterror_test1") +{ /* diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/testinfo.dat deleted file mode 100644 index 44c0197aae0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetLastError -Name = Positive Test for GetLastError -TYPE = DEFAULT -EXE1 = test -Description -= Ensure GetLastError returns the error message which was set. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt deleted file mode 100644 index 1fd61e2fc7f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_getsysteminfo_test1 - ${SOURCES} -) - -add_dependencies(paltest_getsysteminfo_test1 coreclrpal) - -target_link_libraries(paltest_getsysteminfo_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp index f9cb513b7a6..6b2d638b174 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp @@ -12,7 +12,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetSystemInfo_test1_paltest_getsysteminfo_test1, "miscellaneous/GetSystemInfo/test1/paltest_getsysteminfo_test1") +{ SYSTEM_INFO TheSystemInfo; SYSTEM_INFO* pSystemInfo = &TheSystemInfo; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/testinfo.dat deleted file mode 100644 index ac3a2251084..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetSystemInfo -Name = Positive Test for GetSystemInfo -TYPE = DEFAULT -EXE1 = test -Description -= Ensures the two required System Info fields can be aquired, -= and the others are all 0. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt deleted file mode 100644 index 7ad0ef0084b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_gettickcount_test1 - ${SOURCES} -) - -add_dependencies(paltest_gettickcount_test1 coreclrpal) - -target_link_libraries(paltest_gettickcount_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp index 2638f93808b..f783ff878ce 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GetTickCount_test1_paltest_gettickcount_test1, "miscellaneous/GetTickCount/test1/paltest_gettickcount_test1") +{ DWORD FirstCount = 0; DWORD SecondCount = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/testinfo.dat deleted file mode 100644 index dde3d04fbc1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GetTickCount -Name = Positive Test for GetTickCount -TYPE = DEFAULT -EXE1 = test -Description -= Grab two Tick Counts with this function, and ensure that -= the second is larger to show that the tick count is increasing. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/CMakeLists.txt deleted file mode 100644 index 718513d9595..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_globalmemorystatusex_test1 - ${SOURCES} -) - -add_dependencies(paltest_globalmemorystatusex_test1 coreclrpal) - -target_link_libraries(paltest_globalmemorystatusex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/test.cpp index 84de313e71d..358341e8aa3 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/test.cpp @@ -12,7 +12,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_GlobalMemoryStatusEx_test1_paltest_globalmemorystatusex_test1, "miscellaneous/GlobalMemoryStatusEx/test1/paltest_globalmemorystatusex_test1") +{ MEMORYSTATUSEX memoryStatus; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/testinfo.dat deleted file mode 100644 index af14d1b2432..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/GlobalMemoryStatusEx/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = GlobalMemoryStatusEx -Name = Positive Test for GlobalMemoryStatusEx -TYPE = DEFAULT -EXE1 = test -Description -= Ensures that invocation of GlobalMemoryStatusEx succeeds and -= that it returns nonzero virtual and physical memory sizes - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt deleted file mode 100644 index 9602e0b698c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedexchangeadd_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedexchangeadd_test1 coreclrpal) - -target_link_libraries(paltest_interlockedexchangeadd_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp index ba91df17c1c..1d4b258adba 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp @@ -18,7 +18,7 @@ */ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterLockedExchangeAdd_test1_paltest_interlockedexchangeadd_test1, "miscellaneous/InterLockedExchangeAdd/test1/paltest_interlockedexchangeadd_test1") { LONG TheReturn; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt deleted file mode 100644 index be162fb28a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedbit_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedbit_test1 coreclrpal) - -target_link_libraries(paltest_interlockedbit_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp index 027a292c327..20236a3ab1d 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp @@ -20,17 +20,17 @@ typedef struct tag_TEST_DATA UCHAR expectedReturnValue; } TEST_DATA; -TEST_DATA test_data[] = +PALTEST(miscellaneous_InterlockedBit_test1_paltest_interlockedbit_test1, "miscellaneous/InterlockedBit/test1/paltest_interlockedbit_test1") { - { (LONG)0x00000000, 3, (LONG)0x00000000, 0 }, - { (LONG)0x12341234, 2, (LONG)0x12341230, 1 }, - { (LONG)0x12341234, 3, (LONG)0x12341234, 0 }, - { (LONG)0x12341234, 31, (LONG)0x12341234, 0 }, - { (LONG)0x12341234, 28, (LONG)0x02341234, 1 }, - { (LONG)0xffffffff, 28, (LONG)0xefffffff, 1 } -}; - -int __cdecl main(int argc, char *argv[]) { + TEST_DATA test_data[] = + { + { (LONG)0x00000000, 3, (LONG)0x00000000, 0 }, + { (LONG)0x12341234, 2, (LONG)0x12341230, 1 }, + { (LONG)0x12341234, 3, (LONG)0x12341234, 0 }, + { (LONG)0x12341234, 31, (LONG)0x12341234, 0 }, + { (LONG)0x12341234, 28, (LONG)0x02341234, 1 }, + { (LONG)0xffffffff, 28, (LONG)0xefffffff, 1 } + }; /* * Initialize the PAL and return FAILURE if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/testinfo.dat deleted file mode 100644 index ab6067ab151..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedBitTestAndReset -Name = Test for InterlockedBitTestAndReset -TYPE = DEFAULT -EXE1 = test -Description -Test validates that function InterlockedBitTestAndReset work as intended. - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt deleted file mode 100644 index 1771ad9d2fb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedbit_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockedbit_test2 coreclrpal) - -target_link_libraries(paltest_interlockedbit_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp index 0bb01ff124f..956084fd5c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp @@ -20,17 +20,17 @@ typedef struct tag_TEST_DATA UCHAR expectedReturnValue; } TEST_DATA; -TEST_DATA test_data[] = +PALTEST(miscellaneous_InterlockedBit_test2_paltest_interlockedbit_test2, "miscellaneous/InterlockedBit/test2/paltest_interlockedbit_test2") { - { (LONG)0x00000000, 2, (LONG)0x00000004, 0 }, - { (LONG)0x12341234, 2, (LONG)0x12341234, 1 }, - { (LONG)0x12341234, 3, (LONG)0x1234123c, 0 }, - { (LONG)0x12341234, 31, (LONG)0x92341234, 0 }, - { (LONG)0x12341234, 28, (LONG)0x12341234, 1 }, - { (LONG)0xffffffff, 28, (LONG)0xffffffff, 1 } -}; - -int __cdecl main(int argc, char *argv[]) { + TEST_DATA test_data[] = + { + { (LONG)0x00000000, 2, (LONG)0x00000004, 0 }, + { (LONG)0x12341234, 2, (LONG)0x12341234, 1 }, + { (LONG)0x12341234, 3, (LONG)0x1234123c, 0 }, + { (LONG)0x12341234, 31, (LONG)0x92341234, 0 }, + { (LONG)0x12341234, 28, (LONG)0x12341234, 1 }, + { (LONG)0xffffffff, 28, (LONG)0xffffffff, 1 } + }; /* * Initialize the PAL and return FAILURE if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/testinfo.dat deleted file mode 100644 index 9c206d31b34..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedBitTestAndSet -Name = Test for InterlockedBitTestAndSet -TYPE = DEFAULT -EXE1 = test -Description -Test validates that function InterlockedBitTestAndSet work as intended. - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt deleted file mode 100644 index f5546b91291..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedcompareexchange_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedcompareexchange_test1 coreclrpal) - -target_link_libraries(paltest_interlockedcompareexchange_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp index 2d98aac47b0..473c98067d0 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp @@ -22,7 +22,8 @@ #define SECOND_VALUE 5 #define THIRD_VALUE 10 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_InterlockedCompareExchange_test1_paltest_interlockedcompareexchange_test1, "miscellaneous/InterlockedCompareExchange/test1/paltest_interlockedcompareexchange_test1") +{ int BaseVariableToManipulate = START_VALUE; int ValueToExchange = SECOND_VALUE; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/testinfo.dat deleted file mode 100644 index 857c40b684e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedCompareExchange -Name = Positive test of InterlockedCompareExchange -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if both successful and unsuccessful compare exchanges workp -= roperly -- ie. Exchange and don't exchange. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt deleted file mode 100644 index e19fb1184a7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedcompareexchange_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockedcompareexchange_test2 coreclrpal) - -target_link_libraries(paltest_interlockedcompareexchange_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp index 42c94087fc4..1e05e83a44f 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp @@ -29,7 +29,8 @@ void ReleaseLock(PLONG pLock); //Main entry point of the program -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_InterlockedCompareExchange_test2_paltest_interlockedcompareexchange_test2, "miscellaneous/InterlockedCompareExchange/test2/paltest_interlockedcompareexchange_test2") +{ int i = 0; DWORD dwThreadID=0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt deleted file mode 100644 index 7a5f9271b2d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedcompareexchange64_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedcompareexchange64_test1 coreclrpal) - -target_link_libraries(paltest_interlockedcompareexchange64_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp index e91a1461e5a..2fd50dfdbbf 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp @@ -22,7 +22,8 @@ #define SECOND_VALUE 5 #define THIRD_VALUE 10 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_InterlockedCompareExchange64_test1_paltest_interlockedcompareexchange64_test1, "miscellaneous/InterlockedCompareExchange64/test1/paltest_interlockedcompareexchange64_test1") +{ LONGLONG BaseVariableToManipulate = START_VALUE; LONGLONG ValueToExchange = SECOND_VALUE; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/testinfo.dat deleted file mode 100644 index 8021f43156e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedCompareExchange64 -Name = Positive test of InterlockedCompareExchange64 -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if both successful and unsuccessful compare exchanges workp -= roperly -- ie. Exchange and don't exchange. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt deleted file mode 100644 index 41543eff281..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedcompareexchange64_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockedcompareexchange64_test2 coreclrpal) - -target_link_libraries(paltest_interlockedcompareexchange64_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp index 933cb3ff236..bdf5150aa3b 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp @@ -18,10 +18,10 @@ #define MAX_THREADS 64 #define REPEAT_COUNT 10000 -LONG GlobalCounter = 0; -void IncrementCounter(void); +LONG GlobalCounter_InterlockedCompareExchange64_test2 = 0; +void IncrementCounter_InterlockedCompareExchange64_test2(void); -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedCompareExchange64_test2_paltest_interlockedcompareexchange64_test2, "miscellaneous/InterlockedCompareExchange64/test2/paltest_interlockedcompareexchange64_test2") { LONG TotalOperations=0; @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) TotalOperations = MAX_THREADS * REPEAT_COUNT; - GlobalCounter = 0; + GlobalCounter_InterlockedCompareExchange64_test2 = 0; /* * Initialize the PAL and return FAILURE if this fails @@ -54,7 +54,7 @@ int __cdecl main(int argc, char *argv[]) hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size - (LPTHREAD_START_ROUTINE) IncrementCounter, // thread function + (LPTHREAD_START_ROUTINE) IncrementCounter_InterlockedCompareExchange64_test2, // thread function NULL, // argument to thread function 0, // use default creation flags &dwThreadID); // returns the thread identifier @@ -78,7 +78,7 @@ int __cdecl main(int argc, char *argv[]) /* Compare the value of global counter with zero. */ - if (TotalOperations!=GlobalCounter) + if (TotalOperations!=GlobalCounter_InterlockedCompareExchange64_test2) { Fail("Test Case Failed: InterlockedDecrement \n"); } @@ -89,13 +89,13 @@ int __cdecl main(int argc, char *argv[]) return PASS; } -void IncrementCounter(void) +void IncrementCounter_InterlockedCompareExchange64_test2(void) { int i=0; for (i=0; i<REPEAT_COUNT;i++) { - InterlockedIncrement(&GlobalCounter); + InterlockedIncrement(&GlobalCounter_InterlockedCompareExchange64_test2); } } diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt deleted file mode 100644 index eb475890cf5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedcompareexchangepointer_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedcompareexchangepointer_test1 coreclrpal) - -target_link_libraries(paltest_interlockedcompareexchangepointer_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp index 1a4edf77c5d..6ea6bf70e00 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedCompareExchangePointer_test1_paltest_interlockedcompareexchangepointer_test1, "miscellaneous/InterlockedCompareExchangePointer/test1/paltest_interlockedcompareexchangepointer_test1") { long StartValue = 5; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/testinfo.dat deleted file mode 100644 index 7a802c1e8cb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedCompareExchangePointer -Name = Positive test of InterlockedCompareExchangePointer -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if both successful and unsuccessful compare exchanges work -= properly -- ie. Exchange and don't exchange. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt deleted file mode 100644 index adf7267d11b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockeddecrement_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockeddecrement_test1 coreclrpal) - -target_link_libraries(paltest_interlockeddecrement_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp index ddd188cb708..03f7834772e 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedDecrement_test1_paltest_interlockeddecrement_test1, "miscellaneous/InterlockedDecrement/test1/paltest_interlockeddecrement_test1") { int TheValue = 0; int TheReturn; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/testinfo.dat deleted file mode 100644 index e94bf38e740..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedDecrement -Name = Positive test of InterlockedDecrement -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this decrements the variable correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt deleted file mode 100644 index cb66d92cf59..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockeddecrement_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockeddecrement_test2 coreclrpal) - -target_link_libraries(paltest_interlockeddecrement_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp index a9dd8ef2935..2dc372cdab0 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp @@ -18,10 +18,10 @@ #define MAX_THREADS 64 #define REPEAT_COUNT 10000 -LONG GlobalCounter = 0; -void DecrementCounter(void); +LONG GlobalCounter_InterlockedDecrement_test2 = 0; +void DecrementCounter_InterlockedDecrement_test2(void); -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedDecrement_test2_paltest_interlockeddecrement_test2, "miscellaneous/InterlockedDecrement/test2/paltest_interlockeddecrement_test2") { LONG TotalOperations=0; @@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[]) DWORD dwThreadID = 0; HANDLE hThread[MAX_THREADS]; TotalOperations = MAX_THREADS * REPEAT_COUNT; - GlobalCounter = TotalOperations; + GlobalCounter_InterlockedDecrement_test2 = TotalOperations; /* * Initialize the PAL and return FAILURE if this fails @@ -45,7 +45,7 @@ int __cdecl main(int argc, char *argv[]) hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size - (LPTHREAD_START_ROUTINE) DecrementCounter, // thread function + (LPTHREAD_START_ROUTINE) DecrementCounter_InterlockedDecrement_test2, // thread function NULL, // argument to thread function 0, // use default creation flags &dwThreadID); // returns the thread identifier @@ -71,7 +71,7 @@ int __cdecl main(int argc, char *argv[]) /* Compare the value of global counter with zero. */ - if (0!=GlobalCounter) + if (0!=GlobalCounter_InterlockedDecrement_test2) { Fail("Test Case Failed: InterlockedDecrement \n"); } @@ -80,12 +80,12 @@ int __cdecl main(int argc, char *argv[]) return PASS; } -void DecrementCounter(void) +void DecrementCounter_InterlockedDecrement_test2(void) { int i=0; for (i=0; i<REPEAT_COUNT;i++) { - InterlockedDecrement(&GlobalCounter); + InterlockedDecrement(&GlobalCounter_InterlockedDecrement_test2); } } diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt deleted file mode 100644 index 47312943ae8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockeddecrement64_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockeddecrement64_test1 coreclrpal) - -target_link_libraries(paltest_interlockeddecrement64_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp index 8810cd8ecfa..511a52d5d54 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedDecrement64_test1_paltest_interlockeddecrement64_test1, "miscellaneous/InterlockedDecrement64/test1/paltest_interlockeddecrement64_test1") { LONGLONG TheValue = 0; LONGLONG TheReturn; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/testinfo.dat deleted file mode 100644 index 878c1023cb6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedDecrement64 -Name = Positive test of InterlockedDecrement64 -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this decrements the variable correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt deleted file mode 100644 index f3f90d9f4dd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockeddecrement64_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockeddecrement64_test2 coreclrpal) - -target_link_libraries(paltest_interlockeddecrement64_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp index 6bfa89a3854..f006111f945 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp @@ -18,17 +18,17 @@ #define MAX_THREADS 64 #define REPEAT_COUNT 10000 -LONG GlobalCounter = 0; -void DecrementCounter(void); +LONG GlobalCounter_InterlockedDecrement64_test2 = 0; +void DecrementCounter_InterlockedDecrement64_test2(void); -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedDecrement64_test2_paltest_interlockeddecrement64_test2, "miscellaneous/InterlockedDecrement64/test2/paltest_interlockeddecrement64_test2") { LONG TotalOperations=0; int i=0; DWORD dwThreadID = 0; HANDLE hThread[MAX_THREADS]; TotalOperations = MAX_THREADS * REPEAT_COUNT; - GlobalCounter = TotalOperations; + GlobalCounter_InterlockedDecrement64_test2 = TotalOperations; /* * Initialize the PAL and return FAILURE if this fails @@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[]) hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size - (LPTHREAD_START_ROUTINE) DecrementCounter, // thread function + (LPTHREAD_START_ROUTINE) DecrementCounter_InterlockedDecrement64_test2, // thread function NULL, // argument to thread function 0, // use default creation flags &dwThreadID); // returns the thread identifier @@ -73,7 +73,7 @@ int __cdecl main(int argc, char *argv[]) /* Compare the value of global counter with zero. */ - if (0!=GlobalCounter) + if (0!=GlobalCounter_InterlockedDecrement64_test2) { Fail("Test Case Failed: InterlockedDecrement \n"); } @@ -84,13 +84,13 @@ int __cdecl main(int argc, char *argv[]) return PASS; } -void DecrementCounter(void) +void DecrementCounter_InterlockedDecrement64_test2(void) { int i=0; for (i=0; i<REPEAT_COUNT;i++) { - InterlockedDecrement(&GlobalCounter); + InterlockedDecrement(&GlobalCounter_InterlockedDecrement64_test2); } } diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt deleted file mode 100644 index 299e4060f88..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedexchange_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedexchange_test1 coreclrpal) - -target_link_libraries(paltest_interlockedexchange_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp index 670f960c17a..07c97019872 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp @@ -20,7 +20,8 @@ #define START_VALUE 0 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_InterlockedExchange_test1_paltest_interlockedexchange_test1, "miscellaneous/InterlockedExchange/test1/paltest_interlockedexchange_test1") +{ int TheValue = START_VALUE; int NewValue = 5; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/testinfo.dat deleted file mode 100644 index dc5743a8831..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedExchange -Name = Positive test of InterlockedExchange -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this exchanges the variables correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt deleted file mode 100644 index a9a57a1463c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedexchange64_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedexchange64_test1 coreclrpal) - -target_link_libraries(paltest_interlockedexchange64_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp index 97a1f221237..25cae9c0143 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp @@ -20,7 +20,8 @@ #define START_VALUE 0 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_InterlockedExchange64_test1_paltest_interlockedexchange64_test1, "miscellaneous/InterlockedExchange64/test1/paltest_interlockedexchange64_test1") +{ LONGLONG TheValue = START_VALUE; LONGLONG NewValue = 5; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/testinfo.dat deleted file mode 100644 index b55eb9e62ed..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedExchange64 -Name = Positive test of InterlockedExchange64 -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this exchanges the variables correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt deleted file mode 100644 index dad5a31dff0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - InterlockedExchangePointer.cpp -) - -add_executable(paltest_interlockedexchangepointer_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedexchangepointer_test1 coreclrpal) - -target_link_libraries(paltest_interlockedexchangepointer_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp index 4800024f64c..088ab083214 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp @@ -14,7 +14,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedExchangePointer_test1_paltest_interlockedexchangepointer_test1, "miscellaneous/InterlockedExchangePointer/test1/paltest_interlockedexchangepointer_test1") { int err; int i1 = 10; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/testinfo.dat deleted file mode 100644 index b7128df2791..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = miscellaneous -Function = InterlockedExchangePointer -Name = Pos test for InterlockedExchangePointer API to excnage a pair of value -TYPE = DEFAULT -EXE1 = interlockedexchangepointer -Description -=Test the InterlockedExchangePointer to exchange a pair of value diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt deleted file mode 100644 index d0e65acde3c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedincrement_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedincrement_test1 coreclrpal) - -target_link_libraries(paltest_interlockedincrement_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp index d100c1da072..da0116fc179 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedIncrement_test1_paltest_interlockedincrement_test1, "miscellaneous/InterlockedIncrement/test1/paltest_interlockedincrement_test1") { int TheValue = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/testinfo.dat deleted file mode 100644 index e404d7ff345..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedIncreement -Name = Positive test of InterlockedIncrement -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this increments the variable correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt deleted file mode 100644 index 8d03188f3bc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedincrement_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockedincrement_test2 coreclrpal) - -target_link_libraries(paltest_interlockedincrement_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp index 49e31c65fa3..87623b900b7 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp @@ -18,13 +18,13 @@ #define MAX_THREADS 64 #define REPEAT_COUNT 10000 -LONG GlobalCounter = 0; +LONG GlobalCounter_InterlockedIncrement_test2 = 0; -void IncrementCounter(void); +void IncrementCounter_InterlockedIncrement_test2(void); -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedIncrement_test2_paltest_interlockedincrement_test2, "miscellaneous/InterlockedIncrement/test2/paltest_interlockedincrement_test2") { LONG TotalOperations=0; @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) DWORD dwThreadID = 0; HANDLE hThread[MAX_THREADS]; TotalOperations = MAX_THREADS * REPEAT_COUNT; - GlobalCounter = 0; + GlobalCounter_InterlockedIncrement_test2 = 0; /* * Initialize the PAL and return FAILURE if this fails @@ -48,7 +48,7 @@ int __cdecl main(int argc, char *argv[]) hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size - (LPTHREAD_START_ROUTINE) IncrementCounter, // thread function + (LPTHREAD_START_ROUTINE) IncrementCounter_InterlockedIncrement_test2, // thread function NULL, // argument to thread function 0, // use default creation flags &dwThreadID); // returns the thread identifier @@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[]) /* Compare the value of global counter with zero. */ - if (TotalOperations!=GlobalCounter) + if (TotalOperations!=GlobalCounter_InterlockedIncrement_test2) { Fail("Test Case Failed: InterlockedDecrement \n"); } @@ -84,11 +84,11 @@ int __cdecl main(int argc, char *argv[]) return PASS; } -void IncrementCounter(void) +void IncrementCounter_InterlockedIncrement_test2(void) { int i=0; for (i=0; i<REPEAT_COUNT;i++) { - InterlockedIncrement(&GlobalCounter); + InterlockedIncrement(&GlobalCounter_InterlockedIncrement_test2); } } diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt deleted file mode 100644 index b7aa6732c01..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedincrement64_test1 - ${SOURCES} -) - -add_dependencies(paltest_interlockedincrement64_test1 coreclrpal) - -target_link_libraries(paltest_interlockedincrement64_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp index 6e04b49f849..8f2afe0afb5 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedIncrement64_test1_paltest_interlockedincrement64_test1, "miscellaneous/InterlockedIncrement64/test1/paltest_interlockedincrement64_test1") { LONGLONG TheValue = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/testinfo.dat deleted file mode 100644 index 7b9c2712937..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = InterlockedIncrement64 -Name = Positive test of InterlockedIncrement64 -TYPE = DEFAULT -EXE1 = test -Description -= Test to see if this increments the variable correctly and -= has the correct return value. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt deleted file mode 100644 index 7a7bbf819f7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_interlockedincrement64_test2 - ${SOURCES} -) - -add_dependencies(paltest_interlockedincrement64_test2 coreclrpal) - -target_link_libraries(paltest_interlockedincrement64_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp index cabd2176c94..195a5a536aa 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp @@ -18,10 +18,10 @@ #define MAX_THREADS 64 #define REPEAT_COUNT 10000 -LONG GlobalCounter = 0; -void IncrementCounter(void); +LONG GlobalCounter_InterlockedIncrement64_test2 = 0; +void IncrementCounter_InterlockedIncrement64_test2(void); -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_InterlockedIncrement64_test2_paltest_interlockedincrement64_test2, "miscellaneous/InterlockedIncrement64/test2/paltest_interlockedincrement64_test2") { LONG TotalOperations=0; @@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[]) DWORD dwThreadID = 0; HANDLE hThread[MAX_THREADS]; TotalOperations = MAX_THREADS * REPEAT_COUNT; - GlobalCounter = 0; + GlobalCounter_InterlockedIncrement64_test2 = 0; /* * Initialize the PAL and return FAILURE if this fails @@ -50,7 +50,7 @@ int __cdecl main(int argc, char *argv[]) hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size - (LPTHREAD_START_ROUTINE) IncrementCounter, // thread function + (LPTHREAD_START_ROUTINE) IncrementCounter_InterlockedIncrement64_test2, // thread function NULL, // argument to thread function 0, // use default creation flags &dwThreadID); // returns the thread identifier @@ -76,7 +76,7 @@ int __cdecl main(int argc, char *argv[]) /* Compare the value of global counter with zero. */ - if (TotalOperations!=GlobalCounter) + if (TotalOperations!=GlobalCounter_InterlockedIncrement64_test2) { Fail("Test Case Failed: InterlockedDecrement \n"); } @@ -86,13 +86,13 @@ int __cdecl main(int argc, char *argv[]) return PASS; } -void IncrementCounter(void) +void IncrementCounter_InterlockedIncrement64_test2(void) { int i=0; for (i=0; i<REPEAT_COUNT;i++) { - InterlockedIncrement(&GlobalCounter); + InterlockedIncrement(&GlobalCounter_InterlockedIncrement64_test2); } } diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt deleted file mode 100644 index 0df8c3db154..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_isbadcodeptr_test1 - ${SOURCES} -) - -add_dependencies(paltest_isbadcodeptr_test1 coreclrpal) - -target_link_libraries(paltest_isbadcodeptr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp index 619f077c2ca..c3d4fe70c57 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp @@ -23,7 +23,7 @@ * * executable entry point */ -INT __cdecl main(INT argc, CHAR **argv) +PALTEST(miscellaneous_IsBadCodePtr_test1_paltest_isbadcodeptr_test1, "miscellaneous/IsBadCodePtr/test1/paltest_isbadcodeptr_test1") { BOOL ResultValue = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/testinfo.dat deleted file mode 100644 index eb52f3bd83c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = C Runtime -Function = IsBadCodePtr -Name = Positive Test for IsBadCodePtr -TYPE = DEFAULT -EXE1 = test1 -Description -= ensure that IsBadCodePtr return 0 when -= it can read memory or non zero when it can't. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt deleted file mode 100644 index 53b812995b1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_isbadreadptr_test1 - ${SOURCES} -) - -add_dependencies(paltest_isbadreadptr_test1 coreclrpal) - -target_link_libraries(paltest_isbadreadptr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp index 58e2e7c3a25..a74286f03cd 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp @@ -14,7 +14,7 @@ #define MEMORY_AMOUNT 16 -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_IsBadReadPtr_test1_paltest_isbadreadptr_test1, "miscellaneous/IsBadReadPtr/test1/paltest_isbadreadptr_test1") { LPVOID TestingPointer = NULL; BOOL ResultValue = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/testinfo.dat deleted file mode 100644 index a08ac0203b3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = IsBadReadPtr -Name = Return value tests for IsBadReadPtr -TYPE = DEFAULT -EXE1 = test -Description -= Ensure that this returns true and false when it is supposed to. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt deleted file mode 100644 index a238c7c6aa0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_isbadwriteptr_test1 - ${SOURCES} -) - -add_dependencies(paltest_isbadwriteptr_test1 coreclrpal) - -target_link_libraries(paltest_isbadwriteptr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp index 2e3a8507661..64bd8022313 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp @@ -14,7 +14,8 @@ #define MEMORY_AMOUNT 16 -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_IsBadWritePtr_test1_paltest_isbadwriteptr_test1, "miscellaneous/IsBadWritePtr/test1/paltest_isbadwriteptr_test1") +{ void * TestingPointer = NULL; BOOL ResultValue = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/testinfo.dat deleted file mode 100644 index 335b52f2a9c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = IsBadWritePtr -Name = Return Value test IsBadWritePtr -TYPE = DEFAULT -EXE1 = test -Description -= Test to ensure that the function returns true and -= false when it is supposed to. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt deleted file mode 100644 index d4fd77067f1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_isbadwriteptr_test2 - ${SOURCES} -) - -add_dependencies(paltest_isbadwriteptr_test2 coreclrpal) - -target_link_libraries(paltest_isbadwriteptr_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp index e4262c8504e..b1b23f32801 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp @@ -16,7 +16,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_IsBadWritePtr_test2_paltest_isbadwriteptr_test2, "miscellaneous/IsBadWritePtr/test2/paltest_isbadwriteptr_test2") +{ LPVOID PageOne, PageTwo, PageThree; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/testinfo.dat deleted file mode 100644 index dcffd114a6a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = IsBadWritePtr -Name = Return Value test IsBadWritePtr -TYPE = DEFAULT -EXE1 = test2 -Description -= Create three consecuative pages, NOACCES, READWRITE and -= NOACCESS. Check to ensure that the READWRITE page returns 0, to -= ensure that IsBadWritePtr isn't overflowing. Also check the other two -= pages to see that they return non-zero. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt deleted file mode 100644 index a12ebfbe4ae..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_isbadwriteptr_test3 - ${SOURCES} -) - -add_dependencies(paltest_isbadwriteptr_test3 coreclrpal) - -target_link_libraries(paltest_isbadwriteptr_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp index 5b2ac41d4ff..b49c0c63418 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp @@ -13,7 +13,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_IsBadWritePtr_test3_paltest_isbadwriteptr_test3, "miscellaneous/IsBadWritePtr/test3/paltest_isbadwriteptr_test3") +{ LPVOID PageOne; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/testinfo.dat deleted file mode 100644 index 89739c0d09a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = IsBadWritePtr -Name = Return Value test IsBadWritePtr -TYPE = DEFAULT -EXE1 = test3 -Description -= Check that IsBadWritePtr returns non-zero on Read-only memory. - - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt deleted file mode 100644 index 900e7467183..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_messageboxw_test1 - ${SOURCES} -) - -add_dependencies(paltest_messageboxw_test1 coreclrpal) - -target_link_libraries(paltest_messageboxw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp index 4a3f208efa4..3dcd8171bb2 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_MessageBoxW_test1_paltest_messageboxw_test1, "miscellaneous/MessageBoxW/test1/paltest_messageboxw_test1") { /* Declare Variables to use with convert()*/ WCHAR * PalTitle = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/testinfo.dat deleted file mode 100644 index 667db59488c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = MessageBoxW -Name = Positive test of MessageBoxW -TYPE = DEFAULT -EXE1 = test -Description -= Ensure that the return values are correct for each type of Message Style. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt deleted file mode 100644 index 7f3295526b0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_messageboxw_test2 - ${SOURCES} -) - -add_dependencies(paltest_messageboxw_test2 coreclrpal) - -target_link_libraries(paltest_messageboxw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp index 9893decc98e..c75a53bed70 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_MessageBoxW_test2_paltest_messageboxw_test2, "miscellaneous/MessageBoxW/test2/paltest_messageboxw_test2") +{ /* * Initialize the PAL and return FAILURE if this fails diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/testinfo.dat deleted file mode 100644 index 667db59488c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = MessageBoxW -Name = Positive test of MessageBoxW -TYPE = DEFAULT -EXE1 = test -Description -= Ensure that the return values are correct for each type of Message Style. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt deleted file mode 100644 index 97c0701fd3c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_setenvironmentvariablea_test1 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablea_test1 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablea_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp index 6ff916aca03..502637026b9 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp @@ -23,7 +23,7 @@ #include <palsuite.h> #define BUF_SIZE 128 -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableA_test1_paltest_setenvironmentvariablea_test1, "miscellaneous/SetEnvironmentVariableA/test1/paltest_setenvironmentvariablea_test1") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/testinfo.dat deleted file mode 100644 index 3283c2ec73d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableA -Name = Positive test of SetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test1 -Description -= Set an environment variable and check to ensure success was returned. Then -= get the environment variable and compare to the correct value. Also, check -= that calling the function again, resets the variable properly. And that -= calling with NULL deletes the variable. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt deleted file mode 100644 index 34cc7876def..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_setenvironmentvariablea_test2 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablea_test2 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablea_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp index d71e4e2063a..efe05bb785b 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableA_test2_paltest_setenvironmentvariablea_test2, "miscellaneous/SetEnvironmentVariableA/test2/paltest_setenvironmentvariablea_test2") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/testinfo.dat deleted file mode 100644 index 46a5aa0a703..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableA -Name = Return value test of SetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to see that passing NULL to the first param fails. -= Test that passing NULL to both params fails. -= Set an environment variable, then pass NULL to the second param -= to delete it. Then make the same call again, to check that it fails. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt deleted file mode 100644 index 4aa1a4a94b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_setenvironmentvariablea_test3 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablea_test3 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablea_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp index d35d6925ddb..704218321c4 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableA_test3_paltest_setenvironmentvariablea_test3, "miscellaneous/SetEnvironmentVariableA/test3/paltest_setenvironmentvariablea_test3") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/testinfo.dat deleted file mode 100644 index 2f59bc47c9b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableA -Name = Return value test of SetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test3 -Description -= Test creating environment variables that differ only -= by case and check that they are treated as separate -= variables in the BSD operating system. - - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt deleted file mode 100644 index 032acfb9a18..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_setenvironmentvariablea_test4 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablea_test4 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablea_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp index 18473198bf7..4c6998df1da 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableA_test4_paltest_setenvironmentvariablea_test4, "miscellaneous/SetEnvironmentVariableA/test4/paltest_setenvironmentvariablea_test4") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/testinfo.dat deleted file mode 100644 index 4a07a95ce49..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableA -Name = Return value test of SetEnvironmentVariableA -TYPE = DEFAULT -EXE1 = test4 -Description -= Test that creating an environment variable and trying -= to attain the value of the environment variable using -= a name with different case works in the Windows -= Environment. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt deleted file mode 100644 index a0bd6300707..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_setenvironmentvariablew_test1 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablew_test1 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablew_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp index 6541ee07327..01107c8b2cb 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp @@ -21,7 +21,7 @@ /* Depends on GetEnvironmentVariable */ -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableW_test1_paltest_setenvironmentvariablew_test1, "miscellaneous/SetEnvironmentVariableW/test1/paltest_setenvironmentvariablew_test1") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/testinfo.dat deleted file mode 100644 index a35799f9b50..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableW -Name = Positive test of SetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Set an environment variable and check to ensure success was returned. Then -= get the environment variable and compare to the correct value. Also, check -= that calling the function again, resets the variable properly. And that -= calling with NULL deletes the variable. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt deleted file mode 100644 index fa757905857..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_setenvironmentvariablew_test2 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablew_test2 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablew_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp index c20d97cad31..948cf87d2bd 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp @@ -18,7 +18,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableW_test2_paltest_setenvironmentvariablew_test2, "miscellaneous/SetEnvironmentVariableW/test2/paltest_setenvironmentvariablew_test2") { /* Define some buffers needed for the function */ diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/testinfo.dat deleted file mode 100644 index a3b30d087d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableW -Name = Return value test of SetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test -Description -= Test to see that passing NULL to the first param fails. -= Test that passing NULL to both params fails. -= Set an environment variable, then pass NULL to the second param -= to delete it. Then make the same call again, to check that it fails. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt deleted file mode 100644 index 2a7a77e32e8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_setenvironmentvariablew_test3 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablew_test3 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablew_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp index 53b7fc5630a..4c5afe3ab27 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableW_test3_paltest_setenvironmentvariablew_test3, "miscellaneous/SetEnvironmentVariableW/test3/paltest_setenvironmentvariablew_test3") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/testinfo.dat deleted file mode 100644 index 33fbfe54186..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableW -Name = Return value test of SetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test3 -Description -= Create environment variables that differ only by case -= and verify that they are treated distinctly in the -= BSD Operating System. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt deleted file mode 100644 index 7ec1ba81ae5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_setenvironmentvariablew_test4 - ${SOURCES} -) - -add_dependencies(paltest_setenvironmentvariablew_test4 coreclrpal) - -target_link_libraries(paltest_setenvironmentvariablew_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp index 225e104039b..92b5ccf1d30 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_SetEnvironmentVariableW_test4_paltest_setenvironmentvariablew_test4, "miscellaneous/SetEnvironmentVariableW/test4/paltest_setenvironmentvariablew_test4") { #if WIN32 diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/testinfo.dat deleted file mode 100644 index f0da4106847..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetEnvironmentVariableW -Name = Return value test of SetEnvironmentVariableW -TYPE = DEFAULT -EXE1 = test4 -Description -= Create environment variable and try to retrieve -= the value of the variable by using a variable name -= that differs in case. This should not affect the -= return value in the Windows Operating System. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt deleted file mode 100644 index 75775f2cce3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_setlasterror_test1 - ${SOURCES} -) - -add_dependencies(paltest_setlasterror_test1 coreclrpal) - -target_link_libraries(paltest_setlasterror_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp index 8a6b0d3c6fe..f51fdbdf933 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(miscellaneous_SetLastError_test1_paltest_setlasterror_test1, "miscellaneous/SetLastError/test1/paltest_setlasterror_test1") +{ /* Error value that we can set to test */ const unsigned int FAKE_ERROR = 5; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/testinfo.dat deleted file mode 100644 index e81fa1cc3b2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Miscellaneous -Function = SetLastError -Name = Positive test of SetLastError -TYPE = DEFAULT -EXE1 = test -Description -= Set the Last Error and then use GetLastError to make sure -= it was set properly. Assumes GetLastError is working. - - - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt deleted file mode 100644 index 1995383f842..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_i64tow_test1 - ${SOURCES} -) - -add_dependencies(paltest_i64tow_test1 coreclrpal) - -target_link_libraries(paltest_i64tow_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp index 0c48434a0e1..2a44813cde4 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp @@ -21,7 +21,7 @@ typedef struct } testCase; -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous__i64tow_test1_paltest_i64tow_test1, "miscellaneous/_i64tow/test1/paltest_i64tow_test1") { WCHAR buffer[256]; WCHAR *testStr; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/testinfo.dat deleted file mode 100644 index 8ee04a50050..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = miscellaneous -Function = _i64tow_s -Name = Test #1 for _i64tow_s -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests _i64tow_s with normal values and different radices, negative -=values, as well as the highest and lowest values. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt deleted file mode 100644 index 28f975fc236..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_queryperformancecounter_test1 - ${SOURCES} -) - -add_dependencies(paltest_queryperformancecounter_test1 coreclrpal) - -target_link_libraries(paltest_queryperformancecounter_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp index 65c8503b41f..d14fa2fa2bb 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp @@ -14,13 +14,13 @@ #include <palsuite.h> -/* Milliseconds of error which are acceptable Function execution time, etc. - FreeBSD has a "standard" resolution of 50ms for waiting operations, so we - must take that into account as well */ -DWORD AcceptableTimeError = 15; -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_queryperformancecounter_test1_paltest_queryperformancecounter_test1, "miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1") { + /* Milliseconds of error which are acceptable Function execution time, etc. + FreeBSD has a "standard" resolution of 50ms for waiting operations, so we + must take that into account as well */ + DWORD AcceptableTimeError = 15; int i; int NumIterations = 100; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/testinfo.dat deleted file mode 100644 index 56f11fc91b1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -Version = 1.0 -Section = Miscellaneous -Function = QueryPerformanceCounter -Name = Positive Test for QueryPerformanceCounter -TYPE = DEFAULT -EXE1 = test1 -Description -= This test will verify with QueryPerformanceCounter -= and QueryPerformanceFrequency that an API call of Sleep -= of 100 milliseconds takes 100 milliseconds, taking into -= account the error tolerance. diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt deleted file mode 100644 index 3381412046e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_queryperformancefrequency_test1 - ${SOURCES} -) - -add_dependencies(paltest_queryperformancefrequency_test1 coreclrpal) - -target_link_libraries(paltest_queryperformancefrequency_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp index bc3fc076147..3e370ddafb1 100644 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(miscellaneous_queryperformancefrequency_test1_paltest_queryperformancefrequency_test1, "miscellaneous/queryperformancefrequency/test1/paltest_queryperformancefrequency_test1") { LARGE_INTEGER Freq; diff --git a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/testinfo.dat deleted file mode 100644 index ea561422c13..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -Version = 1.0 -Section = Miscellaneous -Function = QueryPerformanceFrequency -Name = Positive Test for QueryPerformanceFrequency -TYPE = DEFAULT -EXE1 = test1 -Description -= This test will verify that QueryPerformanceFrequency -= returns a valid return value. -= The value of the count is processor dependent. On -= some processors, for example, the count might be the -= cycle rate of the processor clock. diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt deleted file mode 100644 index 694090ae90d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# TODO: make these tests compile -# add_subdirectory(PAL_get_stderr) -# add_subdirectory(PAL_get_stdin) -# add_subdirectory(PAL_get_stdout) - -add_subdirectory(PAL_errno) -add_subdirectory(PAL_GetPALDirectoryW) -add_subdirectory(PAL_Initialize_Terminate) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt deleted file mode 100644 index 4c0a408b89a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_GetPALDirectoryW.cpp -) - -add_executable(paltest_pal_getpaldirectoryw_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_getpaldirectoryw_test1 coreclrpal) - -target_link_libraries(paltest_pal_getpaldirectoryw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp index 73099467940..21a1bb3f0aa 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_GetPALDirectoryW_test1_paltest_pal_getpaldirectoryw_test1, "pal_specific/PAL_GetPALDirectoryW/test1/paltest_pal_getpaldirectoryw_test1") { int err; BOOL bValue; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/testinfo.dat deleted file mode 100644 index 306d2e53d3d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_GetPALDirectoryW -Name = Positive test for PAL_GetPALDirectoryW to retrieve fully-qualified directory name. -TYPE = DEFAULT -EXE1 = pal_getpaldirectoryw -Description -=Retrieve the fully-qualified directory name where the PAL DLL is loaded from diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt deleted file mode 100644 index 177003322e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_GetUserTempDirectoryW.cpp -) - -add_executable(paltest_pal_getusertempdirectoryw_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_getusertempdirectoryw_test1 coreclrpal) - -target_link_libraries(paltest_pal_getusertempdirectoryw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp index 2343a6799d4..b09d3f62631 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp @@ -16,7 +16,7 @@ #define DIRECTORYLENGTH 1024 -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_GetUserTempDirectoryW_test1_paltest_pal_getusertempdirectoryw_test1, "pal_specific/PAL_GetUserTempDirectoryW/test1/paltest_pal_getusertempdirectoryw_test1") { int err; DWORD dwFileAttribute; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/testinfo.dat deleted file mode 100644 index 7384f82fb87..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = pal_specific -Function = PAL_GetUserTempDirectoryW -Name = Positive test for PAL_GetUserTempDirectoryW API -TYPE = DEFAULT -EXE1 = pal_getusertempdirectoryw -Description -=Test the PAL_GetUserTempDirectoryW to retrieve the user temp -=directory name diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt deleted file mode 100644 index e5a390313c7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_Initialize_Terminate.cpp -) - -add_executable(paltest_pal_initialize_terminate_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_initialize_terminate_test1 coreclrpal) - -target_link_libraries(paltest_pal_initialize_terminate_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp index 8baba7c8b05..a640cc48a40 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_Initialize_Terminate_test1_paltest_pal_initialize_terminate_test1, "pal_specific/PAL_Initialize_Terminate/test1/paltest_pal_initialize_terminate_test1") { int err; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/testinfo.dat deleted file mode 100644 index 15fb6bfa9aa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_Initialize and PAL_Terminate -Name = Positive test for PAL_Initialize and PAL_Terminate -TYPE = DEFAULT -EXE1 = pal_initialize_terminate -Description -=Test the PAL_Initialize to initialize the PAL environment -=Test the PAL_Terminate to clean up the PAL environment diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt deleted file mode 100644 index bca09933ced..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - pal_initialize_twice.cpp -) - -add_executable(paltest_pal_initialize_terminate_test2 - ${SOURCES} -) - -add_dependencies(paltest_pal_initialize_terminate_test2 coreclrpal) - -target_link_libraries(paltest_pal_initialize_terminate_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp index 2697e370598..5d35cd888f2 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_Initialize_Terminate_test2_paltest_pal_initialize_terminate_test2, "pal_specific/PAL_Initialize_Terminate/test2/paltest_pal_initialize_terminate_test2") { /* Initialize the PAL environment */ if (0 != (PAL_Initialize(argc, argv))) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/testinfo.dat deleted file mode 100644 index baa11675a23..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_Initialize and PAL_Terminate -Name = Positive test for calling PAL_Initialize twice -TYPE = DEFAULT -EXE1 = pal_initialize_twice -Description -=Test calling PAL_Initialize twice to initialize the PAL environment -=and increment the init_count. -=Test calling PAL_Terminate twice to decrement the init_count -=and then clean up the PAL environment. diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/CMakeLists.txt deleted file mode 100644 index 21befe2f82e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2_neg) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt deleted file mode 100644 index 93af8fa7dd1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_RegisterLibraryW_UnregisterLibraryW.cpp -) - -add_executable(paltest_pal_registerlibraryw_unregisterlibraryw_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_registerlibraryw_unregisterlibraryw_test1 coreclrpal) - -target_link_libraries(paltest_pal_registerlibraryw_unregisterlibraryw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp index d4e5578e0ca..5d7b5c9335f 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp @@ -16,7 +16,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_RegisterLibraryW_UnregisterLibraryW_test1_paltest_pal_registerlibraryw_unregisterlibraryw_test1, "pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/paltest_pal_registerlibraryw_unregisterlibraryw_test1") { HMODULE ModuleHandle; char ModuleName[64]; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/testinfo.dat deleted file mode 100644 index 68d1fa0c490..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = pal_specific -Function = PAL_RegisterLibraryW and PAL_UnregisterLibraryW API -Name = Positive test PAL_RegisterLibraryW and PAL_UnregisterLibaryW API -TYPE = DEFAULT -EXE1 = pal_registerlibraryw_unregisterlibraryw -Description -=Test the PAL_RegisterLibraryW and PAL_UnregisterLibraryW to map an executable -=module into calling process address space and unmap this module diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt deleted file mode 100644 index 0ac3cfc56f9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - reg_unreg_libraryw_neg.cpp -) - -add_executable(paltest_reg_unreg_libraryw_neg - ${SOURCES} -) - -add_dependencies(paltest_reg_unreg_libraryw_neg coreclrpal) - -target_link_libraries(paltest_reg_unreg_libraryw_neg - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp index 55838837ae0..6e380901a9e 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_RegisterLibraryW_UnregisterLibraryW_test2_neg_paltest_reg_unreg_libraryw_neg, "pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/paltest_reg_unreg_libraryw_neg") { HMODULE ModuleHandle; char ModuleName[64]; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/testinfo.dat deleted file mode 100644 index b0ebcb3d1d7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = pal_specific -Function = PAL_RegisterLibraryW and PAL_UnregisterLibraryW API -Name = Negative test for PAL_RegisterLibraryW and PAL_UnregisterLibaryW API to map and unmap a non-existant module -TYPE = DEFAULT -EXE1 = pal_registerlibraryw_unregisterlibraryw_neg -Description -=Test the PAL_RegisterLibraryW and PAL_UnregisterLibraryW to map a non-existant -=module into calling process address space - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt deleted file mode 100644 index 32bef1dedb7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_errno.cpp -) - -add_executable(paltest_pal_errno_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_errno_test1 coreclrpal) - -target_link_libraries(paltest_pal_errno_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp index 3f9451ad8c5..29f2da53b05 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp @@ -13,7 +13,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_errno_test1_paltest_pal_errno_test1, "pal_specific/PAL_errno/test1/paltest_pal_errno_test1") { int err; FILE *pFile = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/testinfo.dat deleted file mode 100644 index 8fb427ad338..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_errno -Name = Positive test PAL_errno API to retrieve the pre-thread errno value -TYPE = DEFAULT -EXE1 = pal_errno -Description -=Test the PAL_errno to retrieve a pointer to per-thread errno value diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt deleted file mode 100644 index df89be2b8cd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_get_stderr.cpp -) - -add_executable(paltest_pal_get_stderr_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_get_stderr_test1 coreclrpal) - -target_link_libraries(paltest_pal_get_stderr_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp index 6a2981ce44c..2377505158c 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_get_stderr_test1_paltest_pal_get_stderr_test1, "pal_specific/PAL_get_stderr/test1/paltest_pal_get_stderr_test1") { int err; FILE *pPAL_stderr = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/testinfo.dat deleted file mode 100644 index 87f0e4818df..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_get_stderr -Name = Positive test PAL_get_stderr to retrieve the PAL standard error stream pointer -TYPE = DEFAULT -EXE1 = pal_get_stderr -Description -=Test the PAL_get_stderr to retrieve the PAL standard error output stream pointer and -=output a test message to this error stream -=this test case will be run both manually and automatically diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt deleted file mode 100644 index 859911058d4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_get_stdin.cpp -) - -add_executable(paltest_pal_get_stdin_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_get_stdin_test1 coreclrpal) - -target_link_libraries(paltest_pal_get_stdin_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp index e320f79a9bf..91d8a3a9a65 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_get_stdin_test1_paltest_pal_get_stdin_test1, "pal_specific/PAL_get_stdin/test1/paltest_pal_get_stdin_test1") { int err; FILE *pPAL_stdin = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/testinfo.dat deleted file mode 100644 index b186dc973d4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_get_stdin -Name = Positive test PAL_get_stdin to retrieve the PAL standard stdin stream pointer -TYPE = DEFAULT -EXE1 = pal_get_stdin -Description -=Test the PAL_get_stdin to retrieve the PAL standard input stream pointer -=if success, display the input string to screen -=this test case should be run manually diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt deleted file mode 100644 index 5142c43889f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - PAL_get_stdout.cpp -) - -add_executable(paltest_pal_get_stdout_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_get_stdout_test1 coreclrpal) - -target_link_libraries(paltest_pal_get_stdout_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp index f741278d097..d891e9ac40a 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp @@ -15,7 +15,7 @@ **============================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) +PALTEST(pal_specific_PAL_get_stdout_test1_paltest_pal_get_stdout_test1, "pal_specific/PAL_get_stdout/test1/paltest_pal_get_stdout_test1") { int err; FILE *pPAL_stdout = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/testinfo.dat deleted file mode 100644 index 5c7c3e05adc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_get_stdout -Name = Positive test PAL_get_stdout to retrieve PAL standard output stream pointer -TYPE = DEFAULT -EXE1 = pal_get_stdout -Description -=Test the PAL_get_stdout to retrieve the PAL standard output stream pointer -=This test case will be run both manually and automatically diff --git a/src/coreclr/src/pal/tests/palsuite/paltests.cpp b/src/coreclr/src/pal/tests/palsuite/paltests.cpp new file mode 100644 index 00000000000..4ec0a3982e3 --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/paltests.cpp @@ -0,0 +1,75 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +/*============================================================= +** +** Source: paltests.cpp +** +** Purpose: Entrypoint for all the pal tests. Written to avoid any +** standard library usage +** +**============================================================*/ +#include <palsuite.h> + +PALTest* PALTest::s_tests = 0; + +int PrintUsage(int argc, char *argv[]) +{ + if (PAL_Initialize(argc, argv)) + { + return FAIL; + } + + printf("paltests <PrintPalTests|TestName>\n"); + printf("Either print list of all paltests by passing PrintPalTests, or run a single PAL test.\n"); + + PAL_TerminateEx(FAIL); + return FAIL; +} + +int PrintTests(int argc, char *argv[]) +{ + if (PAL_Initialize(argc, argv)) + { + return FAIL; + } + + PALTest *testCur = PALTest::s_tests; + for (;testCur != 0; testCur = testCur->_next) + { + printf("%s\n", testCur->_name); + } + PAL_Terminate(); + return PASS; +} + +int __cdecl main(int argc, char *argv[]) +{ + if (argc < 2) + { + return PrintUsage(argc, argv); + } + + if (strcmp(argv[1], "PrintPalTests") == 0) + { + return PrintTests(argc, argv); + } + + PALTest *testCur = PALTest::s_tests; + for (;testCur != 0; testCur = testCur->_next) + { + int i = 0; + bool stringMatches = strcmp(testCur->_name, argv[1]) == 0; + if (!stringMatches) + continue; + + for (int i = 1; i < (argc - 1); i++) + { + argv[i] = argv[i + 1]; + } + + return testCur->_entrypoint(argc - 1, argv); + } + + return PrintUsage(argc, argv); +} diff --git a/src/coreclr/src/pal/tests/palsuite/producepaltestlist.proj b/src/coreclr/src/pal/tests/palsuite/producepaltestlist.proj new file mode 100644 index 00000000000..d017708766e --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/producepaltestlist.proj @@ -0,0 +1,21 @@ +<?xml version="1.0" ?> +<Project DefaultTargets = "ProducePALTestList" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="../../../Directory.Build.props" /> + <Import Project="issues.targets" /> + <Target Name="ProducePALTestList"> + <ReadLinesFromFile File="paltestlist.txt"> + <Output TaskParameter="Lines" ItemName="PALTestListFromFile"/> + </ReadLinesFromFile> + + <ItemGroup> + <InitialTrimTestList Include="@(PALTestListFromFile->Trim())" /> + <FilteredTestList Include="@(InitialTrimTestList)" Condition="'%(Identity)' != '' and !@(InitialTrimTestList->StartsWith('#'))"/> + <FilteredTestList Remove="@(ExcludeList)" /> + </ItemGroup> + + <WriteLinesToFile File="$(BinDir)paltests/paltestlist.txt" + Lines="@(FilteredTestList)" + Overwrite="true" + WriteOnlyWhenDifferent="true"/> + </Target> +</Project>
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/runpaltests.sh b/src/coreclr/src/pal/tests/palsuite/runpaltests.sh index cc8ffd6b918..bda11101095 100755 --- a/src/coreclr/src/pal/tests/palsuite/runpaltests.sh +++ b/src/coreclr/src/pal/tests/palsuite/runpaltests.sh @@ -6,7 +6,7 @@ if [ $# -lt 1 -o $# -gt 3 ] then echo "Usage..." - echo "runpaltests.sh <path to root build directory> [<path to temp folder for PAL tests>]" + echo "runpaltests.sh <path to root build directory of the pal tests> [<path to test output folder>] [<path to temp folder for PAL tests>]" echo echo "For example:" echo "runpaltests.sh /projectk/build/debug" @@ -19,11 +19,19 @@ echo "***** Testing PAL *****" echo # Store the location of the root of build directory -BUILD_ROOD_DIR=$1 +BUILD_ROOT_DIR=$1 +if [ -d "$(pwd)/$BUILD_ROOT_DIR" ]; then + BUILD_ROOT_DIR="$(pwd)/$BUILD_ROOT_DIR" +fi + # Create path to the compiled PAL tets in the build directory -PAL_TEST_BUILD=$BUILD_ROOD_DIR/src/pal/tests/palsuite +PAL_TEST_BUILD=$BUILD_ROOT_DIR echo Running PAL tests from $PAL_TEST_BUILD +pushd $BUILD_ROOT_DIR + +export LD_LIBRARY_PATH=$BUILD_ROOT_DIR:$LD_LIBRARY_PATH + # Create absolute path to the file that contains a list of PAL tests to execute. # This file is located next to this script in the source tree RELATIVE_PATH_TO_PAL_TESTS=$0 @@ -33,22 +41,27 @@ RELATIVE_PATH_TO_PAL_TESTS=${RELATIVE_PATH_TO_PAL_TESTS%/*.*} cd $RELATIVE_PATH_TO_PAL_TESTS # Environment variable PWD contains absolute path to the current folder # so use it to create absolute path to the file with a list of tests. -PAL_TEST_LIST=$PWD/paltestlist.txt +PAL_TEST_LIST=$BUILD_ROOT_DIR/paltestlist.txt # Change current directory back to the original location -cd $OLDPWD echo The list of PAL tests to run will be read from $PAL_TEST_LIST # Create the test output root directory -mkdir -p /tmp/PalTestOutput -if [ ! -d /tmp/PalTestOutput ]; then - rm -f -r /tmp/PalTestOutput +if [ $# -gt 2 ] +then + PAL_TEST_OUTPUT_DIR=$3 + mkdir -p $PAL_TEST_OUTPUT_DIR +else mkdir -p /tmp/PalTestOutput + if [ ! -d /tmp/PalTestOutput ]; then + rm -f -r /tmp/PalTestOutput + mkdir -p /tmp/PalTestOutput + fi + PAL_TEST_OUTPUT_DIR=/tmp/PalTestOutput/default fi # Determine the folder to use for PAL test output during the run, and the folder where output files were requested to be copied. # First check if the output folder was passed as a parameter to the script. It is supposed be the second parameter so check if # we have more than 1 argument. -PAL_TEST_OUTPUT_DIR=/tmp/PalTestOutput/default if [ $# -gt 1 ] then COPY_TO_TEST_OUTPUT_DIR=$2 @@ -57,12 +70,17 @@ else fi # Determine the folder to use for PAL test output during the run -if [ "$COPY_TO_TEST_OUTPUT_DIR" != "$PAL_TEST_OUTPUT_DIR" ]; then - # Output files were requested to be copied to a specific folder. In this mode, we need to support parallel runs of PAL tests - # on the same machine. Make a unique temp folder for working output inside /tmp/PalTestOutput. - PAL_TEST_OUTPUT_DIR=$(mktemp -d /tmp/PalTestOutput/tmp.XXXXXXXX) +if [ ! $# -gt 2 ] +then + if [ "$COPY_TO_TEST_OUTPUT_DIR" != "$PAL_TEST_OUTPUT_DIR" ]; then + # Output files were requested to be copied to a specific folder. In this mode, we need to support parallel runs of PAL tests + # on the same machine. Make a unique temp folder for working output inside $PAL_TEST_RESULTS_DIR. + PAL_TEST_OUTPUT_DIR=$(mktemp -d /tmp/PalTestOutput/tmp.XXXXXXXX) + fi fi +cd $PAL_TEST_OUTPUT_DIR + echo PAL tests will store their temporary files and output in $PAL_TEST_OUTPUT_DIR. if [ "$COPY_TO_TEST_OUTPUT_DIR" != "$PAL_TEST_OUTPUT_DIR" ]; then echo Output files will be copied to $COPY_TO_TEST_OUTPUT_DIR at the end. @@ -124,13 +142,19 @@ do # Create path to a test executable to run TEST_COMMAND="$PAL_TEST_BUILD/$TEST_NAME" + if [ ! -f $TEST_COMMAND ]; then + TEST_COMMAND="$PAL_TEST_BUILD/paltests $TEST_NAME" + fi + echo -n . + STARTTIME=$(date +%s) # Redirect to temp file $TEST_COMMAND 2>&1 | tee ${PAL_OUT_FILE} ; ( exit ${PIPESTATUS[0]} ) - # Get exit code of the test process. TEST_EXIT_CODE=$? + ENDTIME=$(date +%s) + # Change back to the output directory, and remove the test's working directory if it's empty cd $PAL_TEST_OUTPUT_DIR rmdir $TEST_WORKING_DIR 2>/dev/null @@ -143,7 +167,7 @@ do TEST_XUNIT_NAME=$(echo $TEST_XUNIT_NAME | tr / .) TEST_XUNIT_CLASSNAME=$(echo $TEST_XUNIT_CLASSNAME | tr / .) - echo -n "<test name=\"$TEST_XUNIT_CLASSNAME.$TEST_XUNIT_NAME\" type=\"$TEST_XUNIT_CLASSNAME\" method=\"$TEST_XUNIT_NAME\" result=\"" >> $PAL_XUNIT_TEST_LIST_TMP + echo -n "<test name=\"$TEST_XUNIT_CLASSNAME.$TEST_XUNIT_NAME\" type=\"$TEST_XUNIT_CLASSNAME\" method=\"$TEST_XUNIT_NAME\" time=\"$(($ENDTIME - $STARTTIME))\" result=\"" >> $PAL_XUNIT_TEST_LIST_TMP # If the exit code is 0 then the test passed, otherwise record a failure. if [ "$TEST_EXIT_CODE" -eq "0" ]; then @@ -153,6 +177,7 @@ do echo "Fail\" >" >> $PAL_XUNIT_TEST_LIST_TMP echo "<failure exception-type=\"Exit code: $TEST_EXIT_CODE\">" >> $PAL_XUNIT_TEST_LIST_TMP echo "<message><![CDATA[$(cat $PAL_OUT_FILE)]]></message>" >> $PAL_XUNIT_TEST_LIST_TMP + echo "<output><![CDATA[$(cat $PAL_OUT_FILE)]]></output>" >> $PAL_XUNIT_TEST_LIST_TMP echo "</failure>" >> $PAL_XUNIT_TEST_LIST_TMP echo "</test>" >> $PAL_XUNIT_TEST_LIST_TMP FAILED_TEST="$TEST_NAME. Exit code: $TEST_EXIT_CODE" @@ -208,6 +233,8 @@ if [ "$COPY_TO_TEST_OUTPUT_DIR" != "$PAL_TEST_OUTPUT_DIR" ]; then echo Copied PAL test output files to $COPY_TO_TEST_OUTPUT_DIR. fi +popd + # Set exit code to be equal to the number PAL tests that have failed. # Exit code 0 indicates success. exit $NUMBER_OF_FAILED_TESTS diff --git a/src/coreclr/src/pal/tests/palsuite/runpaltestshelix.sh b/src/coreclr/src/pal/tests/palsuite/runpaltestshelix.sh new file mode 100644 index 00000000000..4919dc4bc44 --- /dev/null +++ b/src/coreclr/src/pal/tests/palsuite/runpaltestshelix.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# +# This script executes the PAL tests from the specified build location. +# +cd $HELIX_WORKITEM_ROOT + +TEST_OUTPUT_DIR_HELIX=$HELIX_WORKITEM_ROOT/testoutput +$HELIX_WORKITEM_ROOT/runpaltests.sh $HELIX_WORKITEM_ROOT $HELIX_WORKITEM_ROOT/testoutput $HELIX_WORKITEM_ROOT/testoutputtmp +exit_code_paltests=$? +cp $TEST_OUTPUT_DIR_HELIX/pal_tests.xml $HELIX_WORKITEM_ROOT/testResults.xml +exit $exit_code_paltests
\ No newline at end of file diff --git a/src/coreclr/src/pal/tests/palsuite/samples/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/samples/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/samples/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/samples/test1/CMakeLists.txt deleted file mode 100644 index 9841a230a59..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/samples/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_samples_test1 - ${SOURCES} -) - -add_dependencies(paltest_samples_test1 coreclrpal) - -target_link_libraries(paltest_samples_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/samples/test1/test.cpp index 5a8fb032a37..71f2f24eafb 100644 --- a/src/coreclr/src/pal/tests/palsuite/samples/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/samples/test1/test.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(samples_test1_paltest_samples_test1, "samples/test1/paltest_samples_test1") { /* Initialize the PAL. */ diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/samples/test1/testinfo.dat deleted file mode 100644 index 35406bf3375..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/samples/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Samples -Function = sample -Name = Sample Test #1 -TYPE = DEFAULT -EXE1 = test -Description -=This is a sample test case. It will always pass. - - diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/samples/test2/CMakeLists.txt deleted file mode 100644 index 38d447a6527..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/samples/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_samples_test2 - ${SOURCES} -) - -add_dependencies(paltest_samples_test2 coreclrpal) - -target_link_libraries(paltest_samples_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test2/test.cpp b/src/coreclr/src/pal/tests/palsuite/samples/test2/test.cpp index 82877c66c2e..03fd5dc0c7c 100644 --- a/src/coreclr/src/pal/tests/palsuite/samples/test2/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/samples/test2/test.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(samples_test2_paltest_samples_test2, "samples/test2/paltest_samples_test2") { int exampleInt = 9; diff --git a/src/coreclr/src/pal/tests/palsuite/samples/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/samples/test2/testinfo.dat deleted file mode 100644 index e6e4832aa12..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/samples/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Samples -Function = sample -Name = Sample Test #2 -TYPE = DEFAULT -EXE1 = test -Description -=This is a sample test case. It will always fail. - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CMakeLists.txt deleted file mode 100644 index d7219259cf3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -add_subdirectory(CreateEventW) -add_subdirectory(CreateMutexW_ReleaseMutex) -add_subdirectory(CreateProcessW) -add_subdirectory(CreateSemaphoreW_ReleaseSemaphore) -add_subdirectory(CreateThread) -add_subdirectory(CriticalSectionFunctions) -add_subdirectory(DuplicateHandle) -add_subdirectory(ExitProcess) -add_subdirectory(ExitThread) -add_subdirectory(GetCurrentProcess) -add_subdirectory(GetCurrentProcessId) -add_subdirectory(GetCurrentThread) -add_subdirectory(GetCurrentThreadId) -add_subdirectory(GetExitCodeProcess) -add_subdirectory(GetProcessTimes) -add_subdirectory(GetThreadTimes) -add_subdirectory(NamedMutex) -add_subdirectory(OpenEventW) -add_subdirectory(OpenProcess) -add_subdirectory(QueryThreadCycleTime) -add_subdirectory(QueueUserAPC) -add_subdirectory(ReleaseMutex) -add_subdirectory(releasesemaphore) -add_subdirectory(ResetEvent) -add_subdirectory(ResumeThread) -add_subdirectory(SetErrorMode) -add_subdirectory(SetEvent) -add_subdirectory(SignalObjectAndWait) -add_subdirectory(Sleep) -add_subdirectory(SleepEx) -add_subdirectory(SwitchToThread) -add_subdirectory(TerminateProcess) -add_subdirectory(ThreadPriority) -add_subdirectory(WaitForMultipleObjects) -add_subdirectory(WaitForMultipleObjectsEx) -add_subdirectory(WaitForSingleObject) -add_subdirectory(YieldProcessor) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt deleted file mode 100644 index b73b132cd29..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_createeventw_test1 - ${SOURCES} -) - -add_dependencies(paltest_createeventw_test1 coreclrpal) - -target_link_libraries(paltest_createeventw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp index 8153d63a313..361c58d1ad1 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp @@ -19,7 +19,7 @@ #define UNICODE #include <palsuite.h> -BOOL CreateEventTest() +BOOL CreateEventTest_CreateEvent_test1() { BOOL bRet = FALSE; DWORD dwRet = 0; @@ -73,7 +73,7 @@ BOOL CreateEventTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CreateEventW_test1_paltest_createeventw_test1, "threading/CreateEventW/test1/paltest_createeventw_test1") { if(0 != (PAL_Initialize(argc, argv))) @@ -81,7 +81,7 @@ int __cdecl main(int argc, char **argv) return ( FAIL ); } - if(!CreateEventTest()) + if(!CreateEventTest_CreateEvent_test1()) { Fail ("Test failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/testinfo.dat deleted file mode 100644 index d0ed8a534b6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateEventW -Name = Positive Test for CreateEventW -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for CreateEventW. Create an event, ensure the -= HANDLE is valid. Then check to ensure that the object is in the -= signaled state. Close the HANDLE and done. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt deleted file mode 100644 index 60c505b1f49..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_createeventw_test2 - ${SOURCES} -) - -add_dependencies(paltest_createeventw_test2 coreclrpal) - -target_link_libraries(paltest_createeventw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp index 7c7905c7e5f..c40581718fd 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp @@ -14,7 +14,7 @@ #define UNICODE #include <palsuite.h> -BOOL CreateEventTest() +BOOL CreateEventTest_CreateEvent_test2() { BOOL bRet = FALSE; DWORD dwRet = 0; @@ -66,14 +66,14 @@ BOOL CreateEventTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CreateEventW_test2_paltest_createeventw_test2, "threading/CreateEventW/test2/paltest_createeventw_test2") { if(0 != (PAL_Initialize(argc, argv))) { return ( FAIL ); } - if(!CreateEventTest()) + if(!CreateEventTest_CreateEvent_test2()) { Fail ("Test failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/testinfo.dat deleted file mode 100644 index 9588f2d100a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateEventW -Name = Positive Test for CreateEventW -TYPE = DEFAULT -EXE1 = test2 -Description -= Test for CreateEvent. Create the event with the -= initial state being not signaled. Check to ensure that it -= times out when the event is triggered. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt deleted file mode 100644 index 51068211f03..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_createeventw_test3 - ${SOURCES} -) - -add_dependencies(paltest_createeventw_test3 coreclrpal) - -target_link_libraries(paltest_createeventw_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp index 8b07d55d35e..023ccd1018a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp @@ -28,22 +28,21 @@ struct testCase BOOL bResult; }; -struct testCase testCases[]= +PALTEST(threading_CreateEventW_test3_paltest_createeventw_test3, "threading/CreateEventW/test3/paltest_createeventw_test3") { - {0, TRUE, FALSE, {'\0'}, 0, ERROR_SUCCESS, PASS}, - {0, TRUE, FALSE, {'\0'}, 5, ERROR_SUCCESS, PASS}, - {0, TRUE, FALSE, {'\0'}, 5, ERROR_ALREADY_EXISTS, PASS}, - {0, TRUE, FALSE, {'\0'}, 6, ERROR_INVALID_HANDLE, PASS}, - {0, TRUE, FALSE, {'\0'}, MAX_PATH - 1 - 60, ERROR_SUCCESS, PASS}, - {0, TRUE, FALSE, {'\0'}, MAX_PATH - 60, ERROR_SUCCESS, PASS}, -}; - -static HANDLE hEvent[sizeof(testCases)/sizeof(struct testCase)]; + struct testCase testCases[]= + { + {0, TRUE, FALSE, {'\0'}, 0, ERROR_SUCCESS, PASS}, + {0, TRUE, FALSE, {'\0'}, 5, ERROR_SUCCESS, PASS}, + {0, TRUE, FALSE, {'\0'}, 5, ERROR_ALREADY_EXISTS, PASS}, + {0, TRUE, FALSE, {'\0'}, 6, ERROR_INVALID_HANDLE, PASS}, + {0, TRUE, FALSE, {'\0'}, MAX_PATH - 1 - 60, ERROR_SUCCESS, PASS}, + {0, TRUE, FALSE, {'\0'}, MAX_PATH - 60, ERROR_SUCCESS, PASS}, + }; -DWORD result[sizeof(testCases)/sizeof(struct testCase)]; + HANDLE hEvent[sizeof(testCases)/sizeof(struct testCase)]; -int __cdecl main(int argc, char **argv) -{ + DWORD result[sizeof(testCases)/sizeof(struct testCase)]; BOOL bRet = TRUE; WCHAR nonEventName[] = {'a','a','a','a','a','a','\0'}; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/testinfo.dat deleted file mode 100644 index 58d3e98d724..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateEventW/test3/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateEventW -Name = Positive Test for CreateEventW -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests for CreateEventW. Create an unnamed event, create -= an event with an empty name, create an event with a name longer than -= MAX_PATH, MAX_PATH + 1, create an event with a name already taken -= by a non-event object, create an event with a name already taken -= by an event object. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt deleted file mode 100644 index b899c044d2c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateMutexW.cpp -) - -add_executable(paltest_createmutexw_releasemutex_test1 - ${SOURCES} -) - -add_dependencies(paltest_createmutexw_releasemutex_test1 coreclrpal) - -target_link_libraries(paltest_createmutexw_releasemutex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp index 28aa46be7e0..98d079197d5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp @@ -55,13 +55,13 @@ #define OP_NONE 2 -HANDLE hMutex; /* handle to mutex */ +static HANDLE hMutex; /* handle to mutex */ -BOOL bProdErr; /* Producer error Flag */ -BOOL bConErr; /* Consumer error Flag */ +static BOOL bProdErr; /* Producer error Flag */ +static BOOL bConErr; /* Consumer error Flag */ /* Test Buffer */ -char Buffer[MAIN_BUF_SIZE]; +static char Buffer[MAIN_BUF_SIZE]; /* * EmptyBuffer implements the empty operation for test buffer. @@ -230,7 +230,7 @@ DWORD PALAPI Consumer( LPVOID lpParam ) } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CreateMutexW_ReleaseMutex_test1_paltest_createmutexw_releasemutex_test1, "threading/CreateMutexW_ReleaseMutex/test1/paltest_createmutexw_releasemutex_test1") { DWORD dwThreadId; DWORD dwWaitRet; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/testinfo.dat deleted file mode 100644 index 7a95eea6166..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/testinfo.dat +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateMutexW / ReleaseMutex -Name = Positive Test for CreateMutexW and ReleaseMutex -TYPE = DEFAULT -EXE1 = createmutexw -Description -= This test cases test whether a Mutex object created -= with CreateMutexW really works by mutually excluding -= threads from accessing a data structure at the same -= time. Here we have a buffer that can be filled or -= emptied, we use a Mutex object to ensure that one -= operation cannot be started until the other is -= finished. If one operation detects that the other -= has not finished, it fails. There is a Producer -= thread which will try to fill the buffer 25 times, -= and a consumer thread which try to empty the buffer -= 25 times. If either the fill or empty operations -= fails because the Mutex failed to mutually exclude -= then, the corresponding thread will set an error -= flag and return. This will cause the test case to -= fail. -= To increase the probability of identifying problems, -= the Fill opeartion has been slowed dowm with a call -= to Sleep. This ensures that one operation will try -= to access the shared buffer while the other is in -= progress. -= NOTE: this test case also serves as a test case for -= WaitForSingleObject. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt deleted file mode 100644 index 72c6d423ae5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateMutexW.cpp -) - -add_executable(paltest_createmutexw_releasemutex_test2 - ${SOURCES} -) - -add_dependencies(paltest_createmutexw_releasemutex_test2 coreclrpal) - -target_link_libraries(paltest_createmutexw_releasemutex_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp index 2a8ba343f94..1e4ca6c93c5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp @@ -33,13 +33,13 @@ #define UNICODE #include <palsuite.h> -const char *szMutex = "MyMutex"; -const char *szEmpty = ""; +#define szMutex "MyMutex" +#define szEmpty "" /* Function Prototypes */ -BOOL TestNamedMutex(const char *szMutexName); -DWORD NamedMutexThread(LPVOID lpParam); -BOOL NegativeReleaseMutexTests(); +BOOL TestNamedMutex_CreateMutexW_ReleaseMutex_test2(const char *szMutexName); +DWORD NamedMutexThread_CreateMutexW_ReleaseMutex_test2(LPVOID lpParam); +BOOL NegativeReleaseMutexTests_CreateMutexW_ReleaseMutex_test2(); struct ThreadData { @@ -49,7 +49,7 @@ struct ThreadData typedef struct ThreadData THREADDATA; -int __cdecl main (int argc, char **argv) +PALTEST(threading_CreateMutexW_ReleaseMutex_test2_paltest_createmutexw_releasemutex_test2, "threading/CreateMutexW_ReleaseMutex/test2/paltest_createmutexw_releasemutex_test2") { BOOL bFailures = FALSE; char *szMaxPath; @@ -64,7 +64,7 @@ int __cdecl main (int argc, char **argv) * Test named Mutexes with ordinary string */ - if (!TestNamedMutex(szMutex)) + if (!TestNamedMutex_CreateMutexW_ReleaseMutex_test2(szMutex)) { bFailures = TRUE; } @@ -74,7 +74,7 @@ int __cdecl main (int argc, char **argv) * Test named Mutexes with empty ("") string */ - if (!TestNamedMutex(szEmpty)) + if (!TestNamedMutex_CreateMutexW_ReleaseMutex_test2(szEmpty)) { bFailures = TRUE; } @@ -88,7 +88,7 @@ int __cdecl main (int argc, char **argv) memset(szMaxPath, 'A', MAX_LONGPATH-60); szMaxPath[MAX_LONGPATH-60] = 0; - if (!TestNamedMutex(szMaxPath)) + if (!TestNamedMutex_CreateMutexW_ReleaseMutex_test2(szMaxPath)) { bFailures = TRUE; } @@ -100,7 +100,7 @@ int __cdecl main (int argc, char **argv) * Run some negative tests on ReleaseMutex */ - if (!NegativeReleaseMutexTests()) + if (!NegativeReleaseMutexTests_CreateMutexW_ReleaseMutex_test2()) { bFailures = TRUE; } @@ -126,7 +126,7 @@ int __cdecl main (int argc, char **argv) * Try to get multiple handles to a named Mutex and test * to make sure they actually refer to same Mutex object. */ -BOOL TestNamedMutex(const char *szMutexName) +BOOL TestNamedMutex_CreateMutexW_ReleaseMutex_test2(const char *szMutexName) { DWORD dwData; HANDLE hMutex1; @@ -181,7 +181,7 @@ BOOL TestNamedMutex(const char *szMutexName) * Create a thread that will Wait on the second handle. */ threadData.hMutex = hMutex2; - hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)NamedMutexThread, + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)NamedMutexThread_CreateMutexW_ReleaseMutex_test2, (LPVOID)&threadData, 0, &dwData); if (NULL == hThread) @@ -229,7 +229,7 @@ BOOL TestNamedMutex(const char *szMutexName) /* * Thread function used with above testing function. */ -DWORD NamedMutexThread(LPVOID lpParam) +DWORD NamedMutexThread_CreateMutexW_ReleaseMutex_test2(LPVOID lpParam) { BOOL bTimedOut = FALSE; THREADDATA *lpThreadData = (THREADDATA *)lpParam; @@ -259,7 +259,7 @@ DWORD NamedMutexThread(LPVOID lpParam) * * Try some negative tests on ReleaseMutex */ -BOOL NegativeReleaseMutexTests() +BOOL NegativeReleaseMutexTests_CreateMutexW_ReleaseMutex_test2() { HANDLE hMutex; BOOL bRet; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/testinfo.dat deleted file mode 100644 index 948598c875c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/testinfo.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateMutexW / ReleaseMutex -Name = Basic validity Tests for CreateMutexW / ReleaseMutex -TYPE = DEFAULT -EXE1 = createmutexw -Description -= This test case tests the following things -= - Creation of named Mutexes -= - Creating multiple handles to a single named Mutex -= - Ensuring that these handles work interchangeably -= - Setting bInitialOwnerFlag to TRUE will cause the -= initial call to a Wait function on the same Mutex -= to actually wait. -= - Waiting on a Mutex that a thread already owns should -= not block. -= - Create Named mutex with empty string ("") -= - Create Named mutex with string of MAX_PATH length -= - Calling RelaseMutex with invalid Mutex handles and -= valid but unowned Mutexes. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt deleted file mode 100644 index 1a84eb2702d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - parentProcess.cpp -) - -add_executable(paltest_createprocessw_test1 - ${TESTSOURCES} -) - -add_dependencies(paltest_createprocessw_test1 coreclrpal) - -target_link_libraries(paltest_createprocessw_test1 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childProcess.cpp -) - -add_executable(paltest_createprocessw_test1_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_createprocessw_test1_child coreclrpal) - -target_link_libraries(paltest_createprocessw_test1_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp index 73087ab611e..a10dd007992 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp @@ -28,50 +28,10 @@ const WCHAR szCommonFileW[] = {'c','h','i','l','d','d','a','t','a','.','t','m','p','\0'}; -const WCHAR szPathDelimW[] = {'\\','\0'}; - -const char *szCommonStringA = "058d2d057111a313aa82401c2e856002\0"; - -/* - * Take two wide strings representing file and directory names - * (dirName, fileName), join the strings with the appropriate path - * delimiter and populate a wide character buffer (absPathName) with - * the resulting string. - * - * Returns: The number of wide characters in the resulting string. - * 0 is returned on Error. - */ -int -mkAbsoluteFilenameW ( - LPWSTR dirName, - DWORD dwDirLength, - LPCWSTR fileName, - DWORD dwFileLength, - LPWSTR absPathName ) -{ - extern const WCHAR szPathDelimW[]; - - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = wcslen( dirName ); - sizeFN = wcslen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* insure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if ( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - wcsncpy(absPathName, dirName, dwDirLength +1); - wcsncpy(absPathName, szPathDelimW, 2); - wcsncpy(absPathName, fileName, dwFileLength +1); - - return (sizeAPN); -} +#define szCommonStringA "058d2d057111a313aa82401c2e856002\0" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_CreateProcessW_test1_paltest_createprocessw_test1_child, "threading/CreateProcessW/test1/paltest_createprocessw_test1_child") { static FILE * fp; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp index d417f40ec23..88482f39449 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp @@ -30,52 +30,11 @@ const WCHAR szCommonFileW[] = {'c','h','i','l','d','d','a','t','a','.','t','m','p','\0'}; -const WCHAR szChildFileW[] = u"paltest_createprocessw_test1_child"; - -const WCHAR szPathDelimW[] = {'\\','\0'}; - -const char *szCommonStringA = "058d2d057111a313aa82401c2e856002\0"; - -/* - * Take two wide strings representing file and directory names - * (dirName, fileName), join the strings with the appropriate path - * delimiter and populate a wide character buffer (absPathName) with - * the resulting string. - * - * Returns: The number of wide characters in the resulting string. - * 0 is returned on Error. - */ -int -mkAbsoluteFilenameW ( - LPWSTR dirName, - DWORD dwDirLength, - LPCWSTR fileName, - DWORD dwFileLength, - LPWSTR absPathName ) -{ - extern const WCHAR szPathDelimW[]; +const WCHAR szChildFileW[] = u"threading/CreateProcessW/test1/paltest_createprocessw_test1_child"; - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = wcslen( dirName ); - sizeFN = wcslen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* insure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if ( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - wcsncpy(absPathName, dirName, dwDirLength +1); - wcsncpy(absPathName, szPathDelimW, 2); - wcsncpy(absPathName, fileName, dwFileLength +1); - - return (sizeAPN); - -} +#define szCommonStringA "058d2d057111a313aa82401c2e856002\0" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_CreateProcessW_test1_paltest_createprocessw_test1, "threading/CreateProcessW/test1/paltest_createprocessw_test1") { @@ -108,7 +67,6 @@ int __cdecl main( int argc, char **argv ) ZeroMemory ( &pi, sizeof(pi) ); szAbsPathNameW=&absPathBuf[0]; - dwFileLength = wcslen( szChildFileW ); dwDirLength = GetCurrentDirectory(_MAX_PATH, szDirNameW); @@ -118,14 +76,15 @@ int __cdecl main( int argc, char **argv ) "current working directory\n. Exiting.\n"); } - dwSize = mkAbsoluteFilenameW( szDirNameW, dwDirLength, szChildFileW, - dwFileLength, szAbsPathNameW ); + int mbwcResult = MultiByteToWideChar(CP_ACP, 0, argv[0], -1, szAbsPathNameW, sizeof(absPathBuf)); - if (0 == dwSize) + if (0 == mbwcResult) { - Fail ("Palsuite Code: mkAbsoluteFilename() call failed. Could " - "not build absolute path name to file\n. Exiting.\n"); + Fail ("Palsuite Code: MultiByteToWideChar() call failed. Exiting.\n"); } + + wcscat(szAbsPathNameW, u" "); + wcscat(szAbsPathNameW, szChildFileW); if ( !CreateProcessW ( NULL, szAbsPathNameW, diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/testinfo.dat deleted file mode 100644 index 03cd757c154..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateProcessW -Name = Positive Test for CreateProcessW -TYPE = DEFAULT -EXE1 = parentprocess -EXE2 = childprocess -Description -= Test the CreateProcessW function. The test executes the childprocess -= program. The childprocess program launches and writes a const char string -= to a file childdata. The parent waits for the completion of childprocess -= and then reads the string from the childdata file. If the string in the -= file matches it's copy of the const char string, then the test succeeds. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt deleted file mode 100644 index 643d5eb4aa3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - parentprocess.cpp -) - -add_executable(paltest_createprocessw_test2 - ${TESTSOURCES} -) - -add_dependencies(paltest_createprocessw_test2 coreclrpal) - -target_link_libraries(paltest_createprocessw_test2 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childprocess.cpp -) - -add_executable(paltest_createprocessw_test2_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_createprocessw_test2_child coreclrpal) - -target_link_libraries(paltest_createprocessw_test2_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp index f38f2dad23e..72ce2a4e67e 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp @@ -21,7 +21,7 @@ #include "test2.h" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_CreateProcessW_test2_paltest_createprocessw_test2_child, "threading/CreateProcessW/test2/paltest_createprocessw_test2_child") { int iRetCode = EXIT_OK_CODE; /* preset exit code to OK */ char szBuf[BUF_LEN]; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp index 59a8274fe0a..5d69ee224d5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp @@ -30,7 +30,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_CreateProcessW_test2_paltest_createprocessw_test2, "threading/CreateProcessW/test2/paltest_createprocessw_test2") { /******************************************* @@ -119,7 +119,16 @@ int __cdecl main( int argc, char **argv ) si.hStdOutput = hTestStdOutW; si.hStdError = hTestStdErrW; - wcscpy(szFullPathNameW, szChildFileW); + int mbwcResult = MultiByteToWideChar(CP_ACP, 0, argv[0], -1, szFullPathNameW, sizeof(szFullPathNameW)); + + if (0 == mbwcResult) + { + Fail ("Palsuite Code: MultiByteToWideChar() call failed. Exiting.\n"); + } + + wcscat(szFullPathNameW, u" "); + wcscat(szFullPathNameW, szChildFileW); + wcscat(szFullPathNameW, szArgs); /******************************************* diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/test2.h b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/test2.h index 100320dac68..3036e7dae94 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/test2.h +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/test2.h @@ -11,13 +11,13 @@ **=========================================================*/ -const WCHAR szChildFileW[] = u"paltest_createprocessw_test2_child"; +const WCHAR szChildFileW[] = u"threading/CreateProcessW/test2/paltest_createprocessw_test2_child"; const WCHAR szArgs[] = {' ',0x41,' ','B',' ','C','\0'}; const WCHAR szArg1[] = {0x41,'\0'}; const WCHAR szArg2[] = {'B','\0'}; const WCHAR szArg3[] = {'C','\0'}; -const char *szTestString = "An uninteresting test string (it works though)"; +#define szTestString "An uninteresting test string (it works though)" const DWORD EXIT_OK_CODE = 100; const DWORD EXIT_ERR_CODE1 = 101; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/testinfo.dat deleted file mode 100644 index b256fd67f72..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateProcessW/test2/testinfo.dat +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateProcessW -Name = PROCESS_INFORMATION and HANDLE Inheritance -TYPE = DEFAULT -EXE1 = parentprocess -EXE2 = childprocess -Description -= Test the following features of CreateProcessW: -= - Check to see if hProcess & hThread are set in -= return PROCESS_INFORMATION structure -= - Check to see if stdin, stdout, & stderr handles -= are used when STARTF_USESTDHANDLES is specified -= in STARUPINFO flags and bInheritHandles = TRUE -= - Check to see that proper arguments are passed to -= child process diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt deleted file mode 100644 index dbbf165e55a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateSemaphore.cpp -) - -add_executable(paltest_createsemaphorew_releasesemaphore_test1 - ${SOURCES} -) - -add_dependencies(paltest_createsemaphorew_releasesemaphore_test1 coreclrpal) - -target_link_libraries(paltest_createsemaphorew_releasesemaphore_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp index 60c61ff14ea..8650b2140a2 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp @@ -216,9 +216,8 @@ consumer( LPVOID lpParam ) return 0; } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CreateSemaphoreW_ReleaseSemaphore_test1_paltest_createsemaphorew_releasesemaphore_test1, "threading/CreateSemaphoreW_ReleaseSemaphore/test1/paltest_createsemaphorew_releasesemaphore_test1") { - BufferStructure Buffer, *pBuffer; pBuffer = &Buffer; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/testinfo.dat deleted file mode 100644 index 7c11e2b0163..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateSemaphoreExW / ReleaseSemaphore -Name = Positive Test for CreateSemaphoreExW and ReleaseSemaphore -TYPE = DEFAULT -EXE1 = createsemaphore -Description -= Implementation of Producer / Consumer IPC problem using CreateSemaphoreExW -= and ReleaseSemaphore functions. This test case exercises CreateSemaphoreExW -= , ReleaseSemaphore, CreateThread and WaitForSingleObject functions. -= Since there is no way to currently create "pseudo" random events in the -= pal, this example does not behave as classic bounded buffers would. This -= test case is designed to starve the consumer and have the producer fill -= the buffer. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt deleted file mode 100644 index 620b6b2811d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - CreateSemaphore.cpp -) - -add_executable(paltest_createsemaphorew_releasesemaphore_test2 - ${SOURCES} -) - -add_dependencies(paltest_createsemaphorew_releasesemaphore_test2 coreclrpal) - -target_link_libraries(paltest_createsemaphorew_releasesemaphore_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp index bdd91e69a3f..85c10482ccc 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp @@ -3,7 +3,7 @@ /*============================================================ ** -** Source: CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.c +** Source: CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.c ** ** Purpose: Test Semaphore operation using classic IPC problem: ** "Producer-Consumer Problem". @@ -25,15 +25,15 @@ #define _BUF_SIZE 10 -DWORD dwThreadId; /* consumer thread identifier */ +DWORD dwThreadId_CreateSemaphoreW_test2; /* consumer thread identifier */ -HANDLE hThread; /* handle to consumer thread */ +HANDLE hThread_CreateSemaphoreW_test2; /* handle to consumer thread */ -HANDLE hSemaphoreM; /* handle to mutual exclusion semaphore */ +HANDLE hSemaphoreM_CreateSemaphoreW_test2; /* handle to mutual exclusion semaphore */ -HANDLE hSemaphoreE; /* handle to semaphore that counts empty buffer slots */ +HANDLE hSemaphoreE_CreateSemaphoreW_test2; /* handle to semaphore that counts empty buffer slots */ -HANDLE hSemaphoreF; /* handle to semaphore that counts full buffer slots */ +HANDLE hSemaphoreF_CreateSemaphoreW_test2; /* handle to semaphore that counts full buffer slots */ typedef struct Buffer { @@ -43,16 +43,16 @@ typedef struct Buffer } BufferStructure; -CHAR producerItems[PRODUCTION_TOTAL + 1]; +CHAR producerItems_CreateSemaphoreW_test2[PRODUCTION_TOTAL + 1]; -CHAR consumerItems[PRODUCTION_TOTAL + 1]; +CHAR consumerItems_CreateSemaphoreW_test2[PRODUCTION_TOTAL + 1]; /* * Read next message from the Buffer into provided pointer. * Returns: 0 on failure, 1 on success. */ int -readBuf(BufferStructure *Buffer, char *c) +readBuf_CreateSemaphoreW_test2(BufferStructure *Buffer, char *c) { if( Buffer -> writeIndex == Buffer -> readIndex ) { @@ -68,7 +68,7 @@ readBuf(BufferStructure *Buffer, char *c) * Returns: 0 on failure, 1 on success. */ int -writeBuf(BufferStructure *Buffer, CHAR c) +writeBuf_CreateSemaphoreW_test2(BufferStructure *Buffer, CHAR c) { if( ( ((Buffer -> writeIndex) + 1) % _BUF_SIZE) == (Buffer -> readIndex) ) @@ -84,14 +84,15 @@ writeBuf(BufferStructure *Buffer, CHAR c) * Atomic decrement of semaphore value. */ VOID -down(HANDLE hSemaphore) +down_CreateSemaphoreW_test2(HANDLE hSemaphore) { switch ( (WaitForSingleObject ( hSemaphore, - 10000))) + 10000))) /* Wait 10 seconds */ { case WAIT_OBJECT_0: /* - * Semaphore was signaled. OK to access semaphore. + * Semaphore was signaled. OK to access + * semaphore. */ break; case WAIT_ABANDONED: /* @@ -117,7 +118,7 @@ down(HANDLE hSemaphore) * Atomic increment of semaphore value. */ VOID -up(HANDLE hSemaphore) +up_CreateSemaphoreW_test2(HANDLE hSemaphore) { if (!ReleaseSemaphore ( hSemaphore, @@ -131,19 +132,19 @@ up(HANDLE hSemaphore) } /* - * Sleep 10 milleseconds. + * Sleep 500 milleseconds. */ VOID -consumerSleep(VOID) +consumerSleep_CreateSemaphoreW_test2(VOID) { Sleep(10); } /* - * Sleep 500 milleseconds. + * Sleep between 10 milleseconds. */ VOID -producerSleep(VOID) +producerSleep_CreateSemaphoreW_test2(VOID) { Sleep(500); } @@ -152,7 +153,7 @@ producerSleep(VOID) * Produce a message and write the message to Buffer. */ VOID -producer(BufferStructure *Buffer) +producer_CreateSemaphoreW_test2(BufferStructure *Buffer) { int n = 0; @@ -162,21 +163,22 @@ producer(BufferStructure *Buffer) { c = 'A' + n ; /* Produce Item */ - down(hSemaphoreE); - down(hSemaphoreM); + down_CreateSemaphoreW_test2(hSemaphoreE_CreateSemaphoreW_test2); + down_CreateSemaphoreW_test2(hSemaphoreM_CreateSemaphoreW_test2); - if (writeBuf(Buffer, c)) + if (writeBuf_CreateSemaphoreW_test2(Buffer, c)) { Trace("Producer produces %c.\n", c); fflush(stdout); - producerItems[n++] = c; + producerItems_CreateSemaphoreW_test2[n++] = c; } - up(hSemaphoreM); - up(hSemaphoreF); + up_CreateSemaphoreW_test2(hSemaphoreM_CreateSemaphoreW_test2); + up_CreateSemaphoreW_test2(hSemaphoreF_CreateSemaphoreW_test2); - producerSleep(); + producerSleep_CreateSemaphoreW_test2(); } + return; } @@ -185,37 +187,37 @@ producer(BufferStructure *Buffer) */ DWORD PALAPI -consumer( LPVOID lpParam ) +consumer_CreateSemaphoreW_test2( LPVOID lpParam ) { int n = 0; char c; - consumerSleep(); + consumerSleep_CreateSemaphoreW_test2(); while (n < PRODUCTION_TOTAL) { - down(hSemaphoreF); - down(hSemaphoreM); + down_CreateSemaphoreW_test2(hSemaphoreF_CreateSemaphoreW_test2); + down_CreateSemaphoreW_test2(hSemaphoreM_CreateSemaphoreW_test2); - if (readBuf((BufferStructure*)lpParam, &c)) + if (readBuf_CreateSemaphoreW_test2((BufferStructure*)lpParam, &c)) { Trace("\tConsumer consumes %c.\n", c); fflush(stdout); - consumerItems[n++] = c; + consumerItems_CreateSemaphoreW_test2[n++] = c; } - up(hSemaphoreM); - up(hSemaphoreE); + up_CreateSemaphoreW_test2(hSemaphoreM_CreateSemaphoreW_test2); + up_CreateSemaphoreW_test2(hSemaphoreE_CreateSemaphoreW_test2); - consumerSleep(); + consumerSleep_CreateSemaphoreW_test2(); } + return 0; } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CreateSemaphoreW_ReleaseSemaphore_test2_paltest_createsemaphorew_releasesemaphore_test2, "threading/CreateSemaphoreW_ReleaseSemaphore/test2/paltest_createsemaphorew_releasesemaphore_test2") { - BufferStructure Buffer, *pBuffer; pBuffer = &Buffer; @@ -228,7 +230,7 @@ int __cdecl main (int argc, char **argv) /* * Create Semaphores */ - hSemaphoreM = CreateSemaphoreExW ( + hSemaphoreM_CreateSemaphoreW_test2 = CreateSemaphoreExW ( NULL, 1, 1, @@ -236,13 +238,13 @@ int __cdecl main (int argc, char **argv) 0, 0); - if ( NULL == hSemaphoreM ) + if ( NULL == hSemaphoreM_CreateSemaphoreW_test2 ) { - Fail ( "hSemaphoreM = CreateSemaphoreExW () - returned NULL\n" + Fail ( "hSemaphoreM_CreateSemaphoreW_test2 = CreateSemaphoreExW () - returned NULL\n" "Failing Test.\n"); } - hSemaphoreE = CreateSemaphoreExW ( + hSemaphoreE_CreateSemaphoreW_test2 = CreateSemaphoreExW ( NULL, _BUF_SIZE , _BUF_SIZE , @@ -250,13 +252,13 @@ int __cdecl main (int argc, char **argv) 0, 0); - if ( NULL == hSemaphoreE ) + if ( NULL == hSemaphoreE_CreateSemaphoreW_test2 ) { - Fail ( "hSemaphoreE = CreateSemaphoreExW () - returned NULL\n" + Fail ( "hSemaphoreE_CreateSemaphoreW_test2 = CreateSemaphoreExW () - returned NULL\n" "Failing Test.\n"); } - hSemaphoreF = CreateSemaphoreExW ( + hSemaphoreF_CreateSemaphoreW_test2 = CreateSemaphoreExW ( NULL, 0, _BUF_SIZE , @@ -264,9 +266,9 @@ int __cdecl main (int argc, char **argv) 0, 0); - if ( NULL == hSemaphoreF ) + if ( NULL == hSemaphoreF_CreateSemaphoreW_test2 ) { - Fail ( "hSemaphoreF = CreateSemaphoreExW () - returned NULL\n" + Fail ( "hSemaphoreF_CreateSemaphoreW_test2 = CreateSemaphoreExW () - returned NULL\n" "Failing Test.\n"); } @@ -278,15 +280,15 @@ int __cdecl main (int argc, char **argv) /* * Create Consumer */ - hThread = CreateThread( + hThread_CreateSemaphoreW_test2 = CreateThread( NULL, 0, - consumer, + consumer_CreateSemaphoreW_test2, &Buffer, 0, - &dwThreadId); + &dwThreadId_CreateSemaphoreW_test2); - if ( NULL == hThread ) + if ( NULL == hThread_CreateSemaphoreW_test2 ) { Fail ( "CreateThread() returned NULL. Failing test.\n"); } @@ -294,22 +296,22 @@ int __cdecl main (int argc, char **argv) /* * Start producing */ - producer(pBuffer); + producer_CreateSemaphoreW_test2(pBuffer); /* * Wait for consumer to complete */ - WaitForSingleObject (hThread, INFINITE); + WaitForSingleObject (hThread_CreateSemaphoreW_test2, INFINITE); - if ( 0 != strncmp (producerItems, consumerItems, PRODUCTION_TOTAL) ) + if ( 0 != strncmp (producerItems_CreateSemaphoreW_test2, consumerItems_CreateSemaphoreW_test2, PRODUCTION_TOTAL) ) { - Fail("The producerItems string %s\n and the consumerItems string " + Fail("The producerItems_CreateSemaphoreW_test2 string %s\n and the consumerItems_CreateSemaphoreW_test2 string " "%s\ndo not match. This could be a problem with the strncmp()" " function\n FailingTest\nGetLastError() returned %d\n", - producerItems, consumerItems, GetLastError()); + producerItems_CreateSemaphoreW_test2, consumerItems_CreateSemaphoreW_test2, GetLastError()); } - Trace ("producerItems and consumerItems arrays match. All %d\nitems " + Trace ("producerItems_CreateSemaphoreW_test2 and consumerItems_CreateSemaphoreW_test2 arrays match. All %d\nitems " "were produced and consumed in order.\nTest passed.\n", PRODUCTION_TOTAL); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/testinfo.dat deleted file mode 100644 index 372e7ad5e75..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateSemaphoreExW / ReleaseSemaphore -Name = Positive Test for CreateSemaphoreExW and ReleaseSemaphore -TYPE = DEFAULT -EXE1 = createsemaphore -Description -= Implementation of Producer / Consumer IPC problem using CreateSemaphoreExW -= and ReleaseSemaphore functions. This test case exercises CreateSemaphoreExW -= , ReleaseSemaphore, CreateThread and WaitForSingleObject functions. -= Since there is no way to currently create "pseudo" random events in the -= pal, this example does not behave as classic bounded buffers would. This -= test case is designed to starve the producer and have the consumer fill -= the buffer. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt deleted file mode 100644 index c4f38faf131..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - createsemaphore.cpp -) - -add_executable(paltest_createsemaphorew_releasesemaphore_test3 - ${SOURCES} -) - -add_dependencies(paltest_createsemaphorew_releasesemaphore_test3 coreclrpal) - -target_link_libraries(paltest_createsemaphorew_releasesemaphore_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp index caac3c299f0..aa05b89d064 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp @@ -29,7 +29,7 @@ struct testcase BOOL bNegativeTest; }; -struct testcase testCases[] = +struct testcase testCases_CreateSemaphoreW_ReleaseSemaphore_test3[] = { {NULL, -1, 1, NULL, TRUE}, {NULL, 1, -1, NULL, TRUE}, @@ -41,25 +41,25 @@ struct testcase testCases[] = {NULL, INT_MAX, INT_MAX, NULL, FALSE} }; -HANDLE hSemaphore[sizeof(testCases)/sizeof(struct testcase)]; +HANDLE hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[sizeof(testCases_CreateSemaphoreW_ReleaseSemaphore_test3)/sizeof(struct testcase)]; -BOOL cleanup(int index) +BOOL cleanup_ReleaseSemaphore_test3(int index) { int i; BOOL bRet = TRUE; for (i = 0; i < index; i++) { - if (!CloseHandle(hSemaphore[i])) + if (!CloseHandle(hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i])) { bRet = FALSE; Trace("PALSUITE ERROR: CloseHandle(%p) call failed for index %d\n", - hSemaphore[i], i); + hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], i); } } return(bRet); } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CreateSemaphoreW_ReleaseSemaphore_test3_paltest_createsemaphorew_releasesemaphore_test3, "threading/CreateSemaphoreW_ReleaseSemaphore/test3/paltest_createsemaphorew_releasesemaphore_test3") { int i; int j; @@ -69,16 +69,18 @@ int __cdecl main (int argc, char **argv) return (FAIL); } /* create semaphores */ - for (i = 0; i < sizeof(testCases)/sizeof(struct testcase); i++) + testcase* testCases = testCases_CreateSemaphoreW_ReleaseSemaphore_test3; + + for (i = 0; i < sizeof(testCases_CreateSemaphoreW_ReleaseSemaphore_test3)/sizeof(struct testcase); i++) { - hSemaphore[i] = CreateSemaphoreExW (testCases[i].lpSemaphoreAttributes, + hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i] = CreateSemaphoreExW (testCases[i].lpSemaphoreAttributes, testCases[i].lInitialCount, testCases[i].lMaximumCount, testCases[i].lpName, 0, 0); - if (NULL == hSemaphore[i]) + if (NULL == hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i]) { if (!testCases[i].bNegativeTest) { @@ -89,7 +91,7 @@ int __cdecl main (int argc, char **argv) testCases[i].lpName, i, GetLastError()); if (i > 0) { - cleanup(i - 1); + cleanup_ReleaseSemaphore_test3(i - 1); } Fail(""); } @@ -107,21 +109,22 @@ int __cdecl main (int argc, char **argv) { /* Call ReleaseSemaphore once more to ensure ReleaseSemaphore fails */ - if(ReleaseSemaphore(hSemaphore[i], 1, NULL)) + if(ReleaseSemaphore(hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 1, NULL)) { Trace("PALSUITE ERROR: ReleaseSemaphore('%p' '%ld' '%p') " "call returned %d\nwhen it should have returned " "%d.\nThe semaphore's count was %d.\nGetLastError " - "returned %d.\n", hSemaphore[i], 1, NULL, TRUE, + "returned %d.\n", hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 1, NULL, TRUE, + FALSE, j, GetLastError()); - cleanup(i); + cleanup_ReleaseSemaphore_test3(i); Fail(""); } } else { int previous; - BOOL bRet = ReleaseSemaphore(hSemaphore[i], 1, &previous); + BOOL bRet = ReleaseSemaphore(hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 1, &previous); DWORD dwError = GetLastError(); if(!bRet) @@ -130,9 +133,9 @@ int __cdecl main (int argc, char **argv) "call returned %d\nwhen it should have returned " "%d.\nThe semaphore count was %d and it's " "lMaxCount was %d.\nGetLastError returned %d.\n", - hSemaphore[i], 1, &previous, bRet, TRUE, j, + hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 1, &previous, bRet, TRUE, j, testCases[i].lMaximumCount, dwError); - cleanup(i); + cleanup_ReleaseSemaphore_test3(i); Fail(""); } if (previous != j) @@ -140,9 +143,9 @@ int __cdecl main (int argc, char **argv) Trace("PALSUITE ERROR: ReleaseSemaphore('%p' '%ld' '%p') " "call set %p to %d instead of %d.\n The semaphore " "count was %d and GetLastError returned %d.\n", - hSemaphore[i], 1, &previous, &previous, previous, + hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 1, &previous, &previous, previous, j, j, dwError); - cleanup(i); + cleanup_ReleaseSemaphore_test3(i); Fail(""); } } @@ -157,7 +160,7 @@ int __cdecl main (int argc, char **argv) /* decrement semaphore count to 0 */ for (j = testCases[i].lMaximumCount; j >= 0; j--) { - DWORD dwRet = WaitForSingleObject(hSemaphore[i], 0); + DWORD dwRet = WaitForSingleObject(hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 0); DWORD dwError = GetLastError(); if (0 == j) @@ -169,9 +172,9 @@ int __cdecl main (int argc, char **argv) Trace("PALSUITE ERROR: WaitForSingleObject('%p' '%u') " "call returned %d\nwhen it should have returned " "%d.\nThe semaphore's count was %d.\nGetLastError " - "returned %d.\n", hSemaphore[i], 0, dwRet, + "returned %d.\n", hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 0, dwRet, WAIT_TIMEOUT, j, dwError); - cleanup(i); + cleanup_ReleaseSemaphore_test3(i); Fail(""); } } @@ -184,9 +187,9 @@ int __cdecl main (int argc, char **argv) Trace("PALSUITE ERROR: WaitForSingleObject('%p' '%u') " "call returned %d\nwhen it should have returned " "%d.\nThe semaphore's count was %d.\nGetLastError " - "returned %d.\n", hSemaphore[i], 0, dwRet, + "returned %d.\n", hSemaphore_CreateSemaphoreW_ReleaseSemaphore_test3[i], 0, dwRet, WAIT_OBJECT_0, j, dwError); - cleanup(i); + cleanup_ReleaseSemaphore_test3(i); Fail(""); } } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/testinfo.dat deleted file mode 100644 index 1464cc74ff2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/testinfo.dat +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateSemaphoreExW / ReleaseSemaphore -Name = Positive Test for CreateSemaphoreExW and ReleaseSemaphore -TYPE = DEFAULT -EXE1 = createsemaphore -Description -= Test attributes of CreateSemaphoreExW and ReleaseSemaphore. -= Insure for CreateSemaphore that lInitialCount and lMaximumCount -= constraints are respected. Validate that CreateSemaphore rejects -= conditions where, initial count and / or maximum count are negative -= and conditions where the initial count is greater than the maximum -= count. For ReleaseSemaphore validate that lpPreviousCount gets set -= to the previous semaphore count and lpPreviousCount can be NULL. -= Also establish ReleaseSemaphore fails when called in a semaphore -= with count equal to lMaximumCount. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt deleted file mode 100644 index 16b8d432eb4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_createthread_test1 - ${SOURCES} -) - -add_dependencies(paltest_createthread_test1 coreclrpal) - -target_link_libraries(paltest_createthread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp index a1c7e4d0cfb..d856be3571c 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp @@ -95,7 +95,7 @@ BOOL CreateThreadTest() } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CreateThread_test1_paltest_createthread_test1, "threading/CreateThread/test1/paltest_createthread_test1") { if(0 != (PAL_Initialize(argc, argv))) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/testinfo.dat deleted file mode 100644 index ab67f1fa237..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateThread -Name = Positive Test for CreateThread -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for CreateThread. Call CreateThread and ensure -= that it succeeds. Also check to ensure the paramater is passed -= properly. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt deleted file mode 100644 index 5b528271c15..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_createthread_test2 - ${SOURCES} -) - -add_dependencies(paltest_createthread_test2 coreclrpal) - -target_link_libraries(paltest_createthread_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp index 610c2f6da44..b21352d3663 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp @@ -15,15 +15,15 @@ #define NUM_TESTS 3 -HANDLE hThread[NUM_TESTS]; -DWORD dwThreadId[NUM_TESTS]; -volatile BOOL bResult[NUM_TESTS]; -volatile DWORD dwThreadId1[NUM_TESTS]; +HANDLE hThread_CreateThread_test2[NUM_TESTS]; +DWORD dwThreadId_CreateThread_test2[NUM_TESTS]; +volatile BOOL bResult_CreateThread_test2[NUM_TESTS]; +volatile DWORD dwThreadId1_CreateThread_test2[NUM_TESTS]; -DWORD PALAPI Thread( LPVOID lpParameter) +DWORD PALAPI Thread_CreateThread_test2( LPVOID lpParameter) { - dwThreadId1[(DWORD)(SIZE_T)lpParameter] = GetCurrentThreadId(); - bResult[(DWORD)(SIZE_T) lpParameter] = TRUE; + dwThreadId1_CreateThread_test2[(DWORD)(SIZE_T)lpParameter] = GetCurrentThreadId(); + bResult_CreateThread_test2[(DWORD)(SIZE_T) lpParameter] = TRUE; return (DWORD)(SIZE_T) lpParameter; } @@ -36,36 +36,36 @@ struct testCase LPDWORD lpThreadId; }; -struct testCase testCases[]= -{ - {NULL, 0, &Thread, 0, NULL}, - {NULL, 0, &Thread, CREATE_SUSPENDED, NULL}, - {NULL, 0, &Thread, 0, (LPDWORD) 1} -}; - /* * close handles */ -BOOL cleanup(int index) +BOOL cleanup_CreateThread_test2(int index) { int i; BOOL bRet = TRUE; for (i = 0; i < index; i++) { - if (!CloseHandle(hThread[i])) + if (!CloseHandle(hThread_CreateThread_test2[i])) { bRet = FALSE; Trace("PALSUITE ERROR: CloseHandle(%p) call failed for index %d\n", - hThread[i], i); + hThread_CreateThread_test2[i], i); } } return(bRet); } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CreateThread_test2_paltest_createthread_test2, "threading/CreateThread/test2/paltest_createthread_test2") { + struct testCase testCases[]= + { + {NULL, 0, &Thread_CreateThread_test2, 0, NULL}, + {NULL, 0, &Thread_CreateThread_test2, CREATE_SUSPENDED, NULL}, + {NULL, 0, &Thread_CreateThread_test2, 0, (LPDWORD) 1} + }; + SIZE_T i; DWORD dwRetWFSO; DWORD dwRetRT; @@ -79,24 +79,24 @@ int __cdecl main(int argc, char **argv) /* set results array to FALSE */ for (i = 0; i < NUM_TESTS; i++) { - bResult[i]=FALSE; - dwThreadId[i]=0; + bResult_CreateThread_test2[i]=FALSE; + dwThreadId_CreateThread_test2[i]=0; } for (i = 0; i < NUM_TESTS; i++) { if (NULL != testCases[i].lpThreadId) { - testCases[i].lpThreadId = &dwThreadId[i]; + testCases[i].lpThreadId = &dwThreadId_CreateThread_test2[i]; } /* pass the index as the thread argument */ - hThread[i] = CreateThread( testCases[i].lpThreadAttributes, + hThread_CreateThread_test2[i] = CreateThread( testCases[i].lpThreadAttributes, testCases[i].dwStackSize, testCases[i].lpStartAddress, (LPVOID)i, testCases[i].dwCreationFlags, testCases[i].lpThreadId); - if (hThread[i] == NULL) + if (hThread_CreateThread_test2[i] == NULL) { Trace("PALSUITE ERROR: CreateThread('%p' '%d' '%p' '%p' '%d' " "'%p') call failed.\nGetLastError returned '%u'.\n", @@ -104,21 +104,21 @@ int __cdecl main(int argc, char **argv) testCases[i].lpStartAddress, (LPVOID)i, testCases[i].dwCreationFlags, testCases[i].lpThreadId, GetLastError()); - cleanup(i - 1); + cleanup_CreateThread_test2(i - 1); Fail(""); } /* Resume suspended threads */ if (testCases[i].dwCreationFlags == CREATE_SUSPENDED) { - dwRetRT = ResumeThread (hThread[i]); + dwRetRT = ResumeThread (hThread_CreateThread_test2[i]); if (dwRetRT != 1) { Trace ("PALSUITE ERROR: ResumeThread(%p) " "call returned %d it should have returned %d.\n" - "GetLastError returned %u.\n", hThread[i], dwRetRT, + "GetLastError returned %u.\n", hThread_CreateThread_test2[i], dwRetRT, 1, GetLastError()); - cleanup(i); + cleanup_CreateThread_test2(i); Fail(""); } } @@ -127,18 +127,18 @@ int __cdecl main(int argc, char **argv) /* cleanup */ for (i = 0; i < NUM_TESTS; i++) { - dwRetWFSO = WaitForSingleObject(hThread[i], 10000); + dwRetWFSO = WaitForSingleObject(hThread_CreateThread_test2[i], 10000); if (dwRetWFSO != WAIT_OBJECT_0) { Trace ("PALSUITE ERROR: WaitForSingleObject('%p' '%d') " "call returned %d instead of WAIT_OBJECT_0 ('%d').\n" - "GetLastError returned %u.\n", hThread[i], 10000, + "GetLastError returned %u.\n", hThread_CreateThread_test2[i], 10000, dwRetWFSO, WAIT_OBJECT_0, GetLastError()); - cleanup(i); + cleanup_CreateThread_test2(i); Fail(""); } } - if(!cleanup(NUM_TESTS)) + if(!cleanup_CreateThread_test2(NUM_TESTS)) { Fail(""); } @@ -149,7 +149,7 @@ int __cdecl main(int argc, char **argv) * check to see that all threads were created and were passed * the array index as an argument. */ - if (FALSE == bResult[i]) + if (FALSE == bResult_CreateThread_test2[i]) { bRet = FALSE; Trace("PALSUITE ERROR: result[%d]=%d. It should be %d\n", i, @@ -158,20 +158,20 @@ int __cdecl main(int argc, char **argv) /* * check to see that lpThreadId received the correct value. */ - if (0 != dwThreadId[i]) + if (0 != dwThreadId_CreateThread_test2[i]) { - if (dwThreadId[i] != dwThreadId1[i]) + if (dwThreadId_CreateThread_test2[i] != dwThreadId1_CreateThread_test2[i]) { bRet = FALSE; - Trace("PALSUITE ERROR: dwThreadId[%d]=%p and dwThreadId1[%d]" + Trace("PALSUITE ERROR: dwThreadId_CreateThread_test2[%d]=%p and dwThreadId1_CreateThread_test2[%d]" "=%p\nThese values should be identical.\n", i, - dwThreadId[i], i, dwThreadId1[i]); + dwThreadId_CreateThread_test2[i], i, dwThreadId1_CreateThread_test2[i]); } } } if (!bRet) { - cleanup(NUM_TESTS); + cleanup_CreateThread_test2(NUM_TESTS); Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/testinfo.dat deleted file mode 100644 index d08bc095d6a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateThread -Name = Positive Test for CreateThread -TYPE = DEFAULT -EXE1 = test2 -Description -= Test that lpThreadId is assigned the correct threadId value and -= that lpThreadId can be NULL. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt deleted file mode 100644 index d621877ca26..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_createthread_test3 - ${SOURCES} -) - -add_dependencies(paltest_createthread_test3 coreclrpal) - -target_link_libraries(paltest_createthread_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp index 62c28f382a6..526fbb31c7f 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp @@ -13,20 +13,20 @@ #include <palsuite.h> -HANDLE hThread; -HANDLE hEvent; +HANDLE hThread_CreateThread_test3; +HANDLE hEvent_CreateThread_test3; -DWORD PALAPI Thread( LPVOID lpParameter) +DWORD PALAPI Thread_CreateThread_test3( LPVOID lpParameter) { DWORD dwRet; - dwRet = WaitForSingleObject(hEvent, INFINITE); + dwRet = WaitForSingleObject(hEvent_CreateThread_test3, INFINITE); /* if this thread continues beyond here, fail */ Fail(""); return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CreateThread_test3_paltest_createthread_test3, "threading/CreateThread/test3/paltest_createthread_test3") { DWORD dwThreadId; DWORD dwRet; @@ -36,60 +36,60 @@ int __cdecl main(int argc, char **argv) return (FAIL); } - hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + hEvent_CreateThread_test3 = CreateEvent(NULL, TRUE, FALSE, NULL); - if (hEvent == NULL) + if (hEvent_CreateThread_test3 == NULL) { Fail("PALSUITE ERROR: CreateEvent call #0 failed. GetLastError " "returned %u.\n", GetLastError()); } /* pass the index as the thread argument */ - hThread = CreateThread( NULL, + hThread_CreateThread_test3 = CreateThread( NULL, 0, - &Thread, + &Thread_CreateThread_test3, (LPVOID) 0, 0, &dwThreadId); - if (hThread == NULL) + if (hThread_CreateThread_test3 == NULL) { Trace("PALSUITE ERROR: CreateThread('%p' '%d' '%p' '%p' '%d' '%p') " "call failed.\nGetLastError returned '%u'.\n", NULL, - 0, &Thread, (LPVOID) 0, 0, &dwThreadId, GetLastError()); - if (0 == CloseHandle(hEvent)) + 0, &Thread_CreateThread_test3, (LPVOID) 0, 0, &dwThreadId, GetLastError()); + if (0 == CloseHandle(hEvent_CreateThread_test3)) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hEvent); + "clean up.\nGetLastError returned '%u'.\n", hEvent_CreateThread_test3); } Fail(""); } - dwRet = WaitForSingleObject(hThread, 10000); + dwRet = WaitForSingleObject(hThread_CreateThread_test3, 10000); if (dwRet != WAIT_TIMEOUT) { Trace ("PALSUITE ERROR: WaitForSingleObject('%p' '%d') " "call returned %d instead of WAIT_TIMEOUT ('%d').\n" - "GetLastError returned '%u'.\n", hThread, 10000, + "GetLastError returned '%u'.\n", hThread_CreateThread_test3, 10000, dwRet, WAIT_TIMEOUT, GetLastError()); Fail(""); } - if (0 == CloseHandle(hThread)) + if (0 == CloseHandle(hThread_CreateThread_test3)) { Trace("PALSUITE ERROR: Unable to CloseHandle(%p) on a running thread." - "\nGetLastError returned '%u'.\n", hThread, GetLastError()); - if (0 == CloseHandle(hEvent)) + "\nGetLastError returned '%u'.\n", hThread_CreateThread_test3, GetLastError()); + if (0 == CloseHandle(hEvent_CreateThread_test3)) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "cleanup.\nGetLastError returned '%u'.\n", hEvent, + "cleanup.\nGetLastError returned '%u'.\n", hEvent_CreateThread_test3, GetLastError()); } Fail(""); } - if (0 == CloseHandle(hEvent)) + if (0 == CloseHandle(hEvent_CreateThread_test3)) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "cleanup.\nGetLastError returned '%u'.\n", hEvent, + "cleanup.\nGetLastError returned '%u'.\n", hEvent_CreateThread_test3, GetLastError()); Fail(""); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/testinfo.dat deleted file mode 100644 index 6d854f37980..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CreateThread/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CreateThread -Name = Positive Test for CreateThread -TYPE = DEFAULT -EXE1 = test3 -Description -= Check to see that the handle CreateThread returns can be closed while -= the thread is still running. - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/CMakeLists.txt deleted file mode 100644 index ba9a8a2f576..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt deleted file mode 100644 index cbdff5a4f53..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - InitializeCriticalSection.cpp -) - -add_executable(paltest_criticalsectionfunctions_test1 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test1 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp index 6f4dbe43b69..750e42d0672 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp @@ -26,11 +26,11 @@ #define _BUF_SIZE 10 -DWORD dwThreadId; /* consumer thread identifier */ +DWORD dwThreadId_CriticalSectionFunctions_test1; /* consumer thread identifier */ -HANDLE hThread; /* handle to consumer thread */ +HANDLE hThread_CriticalSectionFunctions_test1; /* handle to consumer thread */ -CRITICAL_SECTION CriticalSectionM; /* Critical Section Object (used as mutex) */ +CRITICAL_SECTION CriticalSectionM_CriticalSectionFunctions_test1; /* Critical Section Object (used as mutex) */ typedef struct Buffer { @@ -40,16 +40,16 @@ typedef struct Buffer } BufferStructure; -CHAR producerItems[PRODUCTION_TOTAL + 1]; +CHAR producerItems_CriticalSectionFunctions_test1[PRODUCTION_TOTAL + 1]; -CHAR consumerItems[PRODUCTION_TOTAL + 1]; +CHAR consumerItems_CriticalSectionFunctions_test1[PRODUCTION_TOTAL + 1]; /* * Read next message from the Buffer into provided pointer. * Returns: 0 on failure, 1 on success. */ int -readBuf(BufferStructure *Buffer, char *c) +readBuf_CriticalSectionFunctions_test1(BufferStructure *Buffer, char *c) { if( Buffer -> writeIndex == Buffer -> readIndex ) { @@ -65,7 +65,7 @@ readBuf(BufferStructure *Buffer, char *c) * Returns: 0 on failure, 1 on success. */ int -writeBuf(BufferStructure *Buffer, CHAR c) +writeBuf_CriticalSectionFunctions_test1(BufferStructure *Buffer, CHAR c) { if( ( ((Buffer -> writeIndex) + 1) % _BUF_SIZE) == (Buffer -> readIndex) ) @@ -81,7 +81,7 @@ writeBuf(BufferStructure *Buffer, CHAR c) * Sleep 500 milleseconds. */ VOID -consumerSleep(VOID) +consumerSleep_CriticalSectionFunctions_test1(VOID) { Sleep(500); } @@ -90,7 +90,7 @@ consumerSleep(VOID) * Sleep between 10 milleseconds. */ VOID -producerSleep(VOID) +producerSleep_CriticalSectionFunctions_test1(VOID) { Sleep(10); } @@ -99,7 +99,7 @@ producerSleep(VOID) * Produce a message and write the message to Buffer. */ VOID -producer(BufferStructure *Buffer) +producer_CriticalSectionFunctions_test1(BufferStructure *Buffer) { int n = 0; @@ -109,17 +109,17 @@ producer(BufferStructure *Buffer) { c = 'A' + n ; /* Produce Item */ - EnterCriticalSection(&CriticalSectionM); + EnterCriticalSection(&CriticalSectionM_CriticalSectionFunctions_test1); - if (writeBuf(Buffer, c)) + if (writeBuf_CriticalSectionFunctions_test1(Buffer, c)) { printf("Producer produces %c.\n", c); - producerItems[n++] = c; + producerItems_CriticalSectionFunctions_test1[n++] = c; } - LeaveCriticalSection(&CriticalSectionM); + LeaveCriticalSection(&CriticalSectionM_CriticalSectionFunctions_test1); - producerSleep(); + producerSleep_CriticalSectionFunctions_test1(); } return; @@ -130,33 +130,33 @@ producer(BufferStructure *Buffer) */ DWORD PALAPI -consumer( LPVOID lpParam ) +consumer_CriticalSectionFunctions_test1( LPVOID lpParam ) { int n = 0; char c; - consumerSleep(); + consumerSleep_CriticalSectionFunctions_test1(); while (n < PRODUCTION_TOTAL) { - EnterCriticalSection(&CriticalSectionM); + EnterCriticalSection(&CriticalSectionM_CriticalSectionFunctions_test1); - if (readBuf((BufferStructure*)lpParam, &c)) + if (readBuf_CriticalSectionFunctions_test1((BufferStructure*)lpParam, &c)) { printf("\tConsumer consumes %c.\n", c); - consumerItems[n++] = c; + consumerItems_CriticalSectionFunctions_test1[n++] = c; } - LeaveCriticalSection(&CriticalSectionM); + LeaveCriticalSection(&CriticalSectionM_CriticalSectionFunctions_test1); - consumerSleep(); + consumerSleep_CriticalSectionFunctions_test1(); } return 0; } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test1_paltest_criticalsectionfunctions_test1, "threading/CriticalSectionFunctions/test1/paltest_criticalsectionfunctions_test1") { BufferStructure Buffer, *pBuffer; @@ -172,7 +172,7 @@ int __cdecl main (int argc, char **argv) * Create mutual exclusion mechanisms */ - InitializeCriticalSection ( &CriticalSectionM ); + InitializeCriticalSection ( &CriticalSectionM_CriticalSectionFunctions_test1 ); /* * Initialize Buffer @@ -184,15 +184,15 @@ int __cdecl main (int argc, char **argv) /* * Create Consumer */ - hThread = CreateThread( + hThread_CriticalSectionFunctions_test1 = CreateThread( NULL, 0, - consumer, + consumer_CriticalSectionFunctions_test1, &Buffer, 0, - &dwThreadId); + &dwThreadId_CriticalSectionFunctions_test1); - if ( NULL == hThread ) + if ( NULL == hThread_CriticalSectionFunctions_test1 ) { Fail ( "CreateThread() returned NULL. Failing test.\n" "GetLastError returned %d\n", GetLastError()); @@ -201,30 +201,30 @@ int __cdecl main (int argc, char **argv) /* * Start producing */ - producer(pBuffer); + producer_CriticalSectionFunctions_test1(pBuffer); /* * Wait for consumer to complete */ - WaitForSingleObject (hThread, INFINITE); + WaitForSingleObject (hThread_CriticalSectionFunctions_test1, INFINITE); /* * Compare items produced vs. items consumed */ - if ( 0 != strncmp (producerItems, consumerItems, PRODUCTION_TOTAL) ) + if ( 0 != strncmp (producerItems_CriticalSectionFunctions_test1, consumerItems_CriticalSectionFunctions_test1, PRODUCTION_TOTAL) ) { - Fail("The producerItems string %s\n and the consumerItems string " + Fail("The producerItems_CriticalSectionFunctions_test1 string %s\n and the consumerItems_CriticalSectionFunctions_test1 string " "%s\ndo not match. This could be a problem with the strncmp()" " function\n FailingTest\nGetLastError() returned %d\n", - producerItems, consumerItems, GetLastError()); + producerItems_CriticalSectionFunctions_test1, consumerItems_CriticalSectionFunctions_test1, GetLastError()); } /* * Clean up Critical Section object */ - DeleteCriticalSection(&CriticalSectionM); + DeleteCriticalSection(&CriticalSectionM_CriticalSectionFunctions_test1); - Trace("producerItems and consumerItems arrays match. All %d\nitems " + Trace("producerItems_CriticalSectionFunctions_test1 and consumerItems_CriticalSectionFunctions_test1 arrays match. All %d\nitems " "were produced and consumed in order.\nTest passed.\n", PRODUCTION_TOTAL); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/testinfo.dat deleted file mode 100644 index 41db3e985c0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/testinfo.dat +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = InitializeCriticalSection / EnterCriticalSection / LeaveCriticalSection / DeleteCriticalSection -Name = Positive Test for InitializeCriticalSection, EnterCriticalSection, LeaveCriticalSection and DeleteCriticalSection -TYPE = DEFAULT -EXE1 = initializecriticalsection -Description -= Implementation of Producer / Consumer IPC problem using the -= "CriticalSection" functions to provide a mutual exclusion mechanism. -= This test case exercises InitializeCriticalSection, EnterCriticalSection, -= LeaveCriticalSection, DeleteCriticalSection, and WaitForSingleObject -= functions. -= This case doesn't work with more than one producer and one consumer. -= The producer thread and consumer thread each take turns blocking on -= the CriticalSection object and do not have any other synchronization -= mechanisms. This prevents adding producers or consumers as there are -= no mechanisms to block them once the buffer is full. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt deleted file mode 100644 index 9f537dd1ecf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_criticalsectionfunctions_test2 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test2 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp index 41b104935e0..4bb75dfcf95 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp @@ -25,14 +25,12 @@ #include <palsuite.h> -CRITICAL_SECTION CriticalSection; - volatile BOOL t0_tflag = FAIL; /* thread 0 timeout flag */ volatile BOOL t1_aflag = FAIL; /* thread 1 access flag */ volatile BOOL t1_cflag = FAIL; /* thread 1 critical section flag */ volatile BOOL bTestResult = FAIL; -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test2(LPVOID lpParam) { t1_aflag = PASS; EnterCriticalSection(&CriticalSection); @@ -41,7 +39,7 @@ DWORD PALAPI Thread(LPVOID lpParam) return 0; } -int __cdecl main (int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test2_paltest_criticalsectionfunctions_test2, "threading/CriticalSectionFunctions/test2/paltest_criticalsectionfunctions_test2") { HANDLE hThread; DWORD dwThreadId; @@ -63,7 +61,7 @@ int __cdecl main (int argc, char **argv) */ hThread = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test2, (LPVOID) NULL, CREATE_SUSPENDED, &dwThreadId); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/testinfo.dat deleted file mode 100644 index 22f5d1445ce..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CriticalSectionFunctions -Name = Positive test to ensure CRITICAL_SECTION objects can be nested -TYPE = DEFAULT -EXE1 = test2 -Description -= Test that we are able to nest critical section calls. -= The initial thread makes a call to EnterCriticalSection once, -= blocking on a CRITICAL_SECTION object and creates a new thread. -= The newly created thread blocks on the same CRITICAL_SECTION object. -= The first thread now makes a call to LeaveCriticalSection. -= Test to see that the new thread doesn't get unblocked. - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt deleted file mode 100644 index 7435fdaf2e7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_criticalsectionfunctions_test3 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test3 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp index 12096eba27f..c86344a295a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp @@ -30,95 +30,94 @@ #define NUM_THREADS 2 -HANDLE hThread[NUM_THREADS]; -HANDLE hEvent[NUM_THREADS]; -CRITICAL_SECTION CriticalSection; -BOOL bRet = FAIL; +HANDLE hThread_CriticalSectionFunctions_test3[NUM_THREADS]; +HANDLE hEvent_CriticalSectionFunctions_test3[NUM_THREADS]; +BOOL bRet_CriticalSectionFunctions_test3 = FAIL; -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test3(LPVOID lpParam) { DWORD dwRet; if (0 == TryEnterCriticalSection(&CriticalSection)) { - dwRet = WaitForMultipleObjects(NUM_THREADS, hEvent, TRUE, 10000); + dwRet = WaitForMultipleObjects(NUM_THREADS, hEvent_CriticalSectionFunctions_test3, TRUE, 10000); if ((WAIT_OBJECT_0 > dwRet) || ((WAIT_OBJECT_0 + NUM_THREADS - 1) < dwRet)) { #if 0 - if (0 == CloseHandle(hThread[1])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up.\nGetLastError returned '%d'.\n", - hThread[1], GetLastError()); + hThread_CriticalSectionFunctions_test3[1], GetLastError()); } #endif Trace("PALSUITE ERROR: WaitForMultipleObjects(%d, %p, %d, %d) call" "returned an unexpected value, '%d'.\nGetLastError returned " - "%d.\n", NUM_THREADS, hEvent, TRUE, 10000, dwRet, + "%d.\n", NUM_THREADS, hEvent_CriticalSectionFunctions_test3, TRUE, 10000, dwRet, GetLastError()); } else { - bRet = PASS; + bRet_CriticalSectionFunctions_test3 = PASS; } } else { /* signal thread 0 */ - if (0 == SetEvent(hEvent[0])) + if (0 == SetEvent(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute SetEvent(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); LeaveCriticalSection(&CriticalSection); - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up\nGetLastError returned '%d'.\n", - hThread[0], GetLastError()); + hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up\nGetLastError returned '%d'.\n", - hEvent[0], GetLastError()); + hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up\nGetLastError returned '%d'.\n", - hEvent[1], GetLastError()); + hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); Fail(""); } /* wait to be signaled */ - dwRet = WaitForSingleObject(hEvent[1], 10000); + dwRet = WaitForSingleObject(hEvent_CriticalSectionFunctions_test3[1], 10000); if (WAIT_OBJECT_0 != dwRet) { Trace("PALSUITE ERROR: WaitForSingleObject(%p,%d) should have " "returned\nWAIT_OBJECT_0 ('%d'), instead it returned " "('%d').\nGetLastError returned '%d'.\n", - hEvent[0], 10000, WAIT_OBJECT_0, dwRet, GetLastError()); - if (0 == CloseHandle(hThread[0])) + hEvent_CriticalSectionFunctions_test3[0], 10000, WAIT_OBJECT_0, dwRet, GetLastError()); + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up.\nGetLastError returned '%d'.\n", - hThread[0], GetLastError()); + hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up.\nGetLastError returned '%d'.\n", - hEvent[0], GetLastError()); + hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) " "during clean up.\nGetLastError returned '%d.'\n", - hEvent[1], GetLastError()); + hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); Fail(""); @@ -128,64 +127,64 @@ DWORD PALAPI Thread(LPVOID lpParam) return FAIL; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test3_paltest_criticalsectionfunctions_test3, "threading/CriticalSectionFunctions/test3/paltest_criticalsectionfunctions_test3") { - HANDLE hThread[NUM_THREADS]; + HANDLE hThread_CriticalSectionFunctions_test3[NUM_THREADS]; DWORD dwThreadId[NUM_THREADS]; DWORD dwRet; if ((PAL_Initialize(argc,argv)) != 0) { - return(bRet); + return(bRet_CriticalSectionFunctions_test3); } /* thread 0 event */ - hEvent[0] = CreateEvent(NULL, TRUE, FALSE, NULL); + hEvent_CriticalSectionFunctions_test3[0] = CreateEvent(NULL, TRUE, FALSE, NULL); - if (hEvent[0] == NULL) + if (hEvent_CriticalSectionFunctions_test3[0] == NULL) { Fail("PALSUITE ERROR: CreateEvent call #0 failed. GetLastError " "returned %d.\n", GetLastError()); } /* thread 1 event */ - hEvent[1] = CreateEvent(NULL, TRUE, FALSE, NULL); + hEvent_CriticalSectionFunctions_test3[1] = CreateEvent(NULL, TRUE, FALSE, NULL); - if (hEvent[1] == NULL) + if (hEvent_CriticalSectionFunctions_test3[1] == NULL) { Trace("PALSUITE ERROR: CreateEvent call #1 failed. GetLastError " "returned %d.\n", GetLastError()); - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0]); + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0]); } Fail(""); } InitializeCriticalSection ( &CriticalSection ); - hThread[0] = CreateThread(NULL, + hThread_CriticalSectionFunctions_test3[0] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test3, (LPVOID) NULL, 0, &dwThreadId[0]); - if (hThread[0] == NULL) + if (hThread_CriticalSectionFunctions_test3[0] == NULL) { Trace("PALSUITE ERROR: CreateThread call #0 failed. GetLastError " "returned %d.\n", GetLastError()); - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); @@ -194,29 +193,29 @@ int __cdecl main(int argc, char **argv) /* wait for thread 0 to be signaled */ - dwRet = WaitForSingleObject(hEvent[0], 10000); + dwRet = WaitForSingleObject(hEvent_CriticalSectionFunctions_test3[0], 10000); if (WAIT_OBJECT_0 != dwRet) { Trace("PALSUITE ERROR: WaitForSingleObject(%p,%d) should have " "returned\nWAIT_OBJECT_0 ('%d'), instead it returned " - "('%d').\nGetLastError returned '%d'.\n", hEvent[0], 10000, + "('%d').\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], 10000, WAIT_OBJECT_0, dwRet, GetLastError()); - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[0], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } Fail(""); @@ -229,10 +228,10 @@ int __cdecl main(int argc, char **argv) if (0 == TryEnterCriticalSection(&CriticalSection)) { /* signal thread 1 */ - if (0 == SetEvent(hEvent[1])) + if (0 == SetEvent(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute SetEvent(%p) call.\n" - "GetLastError returned '%d'.\n", hEvent[1], + "GetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); goto done; } @@ -242,22 +241,22 @@ int __cdecl main(int argc, char **argv) Trace("PALSUITE_ERROR: TryEnterCriticalSection was able to grab a" " CRITICAL_SECTION object\nwhich was already owned.\n"); LeaveCriticalSection(&CriticalSection); - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[0], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); @@ -269,71 +268,71 @@ int __cdecl main(int argc, char **argv) */ EnterCriticalSection(&CriticalSection); - hThread[1] = CreateThread(NULL, + hThread_CriticalSectionFunctions_test3[1] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test3, (LPVOID) NULL, 0, &dwThreadId[1]); - if (hThread[1] == NULL) + if (hThread_CriticalSectionFunctions_test3[1] == NULL) { Trace("PALSUITE ERROR: CreateThread call #1 failed. GetLastError " "returned %d.\n", GetLastError()); LeaveCriticalSection(&CriticalSection); - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[0], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); Fail(""); } - dwRet = WaitForMultipleObjects(NUM_THREADS, hThread, TRUE, 10000); + dwRet = WaitForMultipleObjects(NUM_THREADS, hThread_CriticalSectionFunctions_test3, TRUE, 10000); if ((WAIT_OBJECT_0 > dwRet) || ((WAIT_OBJECT_0 + NUM_THREADS - 1) < dwRet)) { Trace("PALSUITE ERROR: WaitForMultipleObjects(%d, %p, %d, %d) call " "returned an unexpected value, '%d'.\nGetLastError returned " - "%d.\n", NUM_THREADS, hThread, TRUE, 10000, dwRet, + "%d.\n", NUM_THREADS, hThread_CriticalSectionFunctions_test3, TRUE, 10000, dwRet, GetLastError()); LeaveCriticalSection(&CriticalSection); - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[0], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hThread[1])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[1], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[1], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); @@ -341,35 +340,35 @@ int __cdecl main(int argc, char **argv) } LeaveCriticalSection(&CriticalSection); - if (0 == CloseHandle(hThread[1])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[1], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[1], GetLastError()); } done: - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hThread[0], + "clean up.\nGetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[0])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[0])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[0], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[0], GetLastError()); } - if (0 == CloseHandle(hEvent[1])) + if (0 == CloseHandle(hEvent_CriticalSectionFunctions_test3[1])) { Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%d'.\n", hEvent[1], + "clean up.\nGetLastError returned '%d'.\n", hEvent_CriticalSectionFunctions_test3[1], GetLastError()); } DeleteCriticalSection(&CriticalSection); - PAL_TerminateEx(bRet); + PAL_TerminateEx(bRet_CriticalSectionFunctions_test3); - return (bRet); + return (bRet_CriticalSectionFunctions_test3); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/testinfo.dat deleted file mode 100644 index cf9cf558bc8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/testinfo.dat +++ /dev/null @@ -1,28 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CriticalSectionFunctions -Name = Positive Test for TryEnterCriticalSection -TYPE = DEFAULT -EXE1 = test3 -Description -= Create two threads to exercise TryEnterCriticalSection -= and EnterCriticalSection. TryEnterCriticalSection acquires -= and holds a CRITICAL_SECTION object. Another call to -= TryEnterCriticalSection is made from a different thread, at -= this time, to establish a call to TryEnterCriticalSection -= will return immediatly and to establish -= TryEnterCriticalSection returns the proper value when it -= attempts to lock a CRITICAL_SECTION that is already owned -= by another thread. The CRITICAL_SECTION object is then -= released and held by a call to EnterCriticalSection. A new -= thread is invoked and attempts to acquire the held -= CRITICAL_SECTION with a call to TryEnterCriticalSection. -= TryEnterCriticalSection returns immediatly and returns -= with the value that states the CRITICAL_SECTION object is -= held by another thread. This establishes -= TryEnterCriticalSection behaves the same way with -= CriticalSections locked by TryEnterCriticalSection and -= EnterCriticalSection. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt deleted file mode 100644 index 6fe8258cec3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_criticalsectionfunctions_test4 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test4 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp index ee3e60008a4..14a737abd3a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp @@ -28,108 +28,108 @@ #define NUM_BLOCKING_THREADS 2 -BOOL bTestResult; -CRITICAL_SECTION CriticalSection; -HANDLE hThread[NUM_BLOCKING_THREADS]; -HANDLE hEvent; -DWORD dwThreadId[NUM_BLOCKING_THREADS]; -volatile int flags[NUM_BLOCKING_THREADS] = {0,0}; - -DWORD PALAPI ThreadTest1(LPVOID lpParam) +BOOL bTestResult_CriticalSectionFunctions_test4; +CRITICAL_SECTION CriticalSection_CriticalSectionFunctions_test4; +HANDLE hThread_CriticalSectionFunctions_test4[NUM_BLOCKING_THREADS]; +HANDLE hEvent_CriticalSectionFunctions_test4; +DWORD dwThreadId_CriticalSectionFunctions_test4[NUM_BLOCKING_THREADS]; +volatile int flags_CriticalSectionFunctions_test4[NUM_BLOCKING_THREADS] = {0,0}; + +DWORD PALAPI ThreadTest1_CriticalSectionFunctions_test4(LPVOID lpParam) { - EnterCriticalSection ( &CriticalSection ); + EnterCriticalSection ( &CriticalSection_CriticalSectionFunctions_test4 ); - flags[0] = 1; + flags_CriticalSectionFunctions_test4[0] = 1; return 0; } -DWORD PALAPI ThreadTest2(LPVOID lpParam) +DWORD PALAPI ThreadTest2_CriticalSectionFunctions_test4(LPVOID lpParam) { - EnterCriticalSection ( &CriticalSection ); + EnterCriticalSection ( &CriticalSection_CriticalSectionFunctions_test4 ); - flags[1] = 1; + flags_CriticalSectionFunctions_test4[1] = 1; return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test4_paltest_criticalsectionfunctions_test4, "threading/CriticalSectionFunctions/test4/paltest_criticalsectionfunctions_test4") { DWORD dwRet; DWORD dwRet1; - bTestResult = FAIL; + bTestResult_CriticalSectionFunctions_test4 = FAIL; if ((PAL_Initialize(argc,argv)) != 0) { - return(bTestResult); + return(bTestResult_CriticalSectionFunctions_test4); } /* * Create Critical Section Object */ - InitializeCriticalSection ( &CriticalSection ); + InitializeCriticalSection ( &CriticalSection_CriticalSectionFunctions_test4 ); - EnterCriticalSection ( &CriticalSection ); + EnterCriticalSection ( &CriticalSection_CriticalSectionFunctions_test4 ); - hThread[0] = CreateThread(NULL, + hThread_CriticalSectionFunctions_test4[0] = CreateThread(NULL, 0, - &ThreadTest1, + &ThreadTest1_CriticalSectionFunctions_test4, (LPVOID) 0, CREATE_SUSPENDED, - &dwThreadId[0]); - if (hThread[0] == NULL) + &dwThreadId_CriticalSectionFunctions_test4[0]); + if (hThread_CriticalSectionFunctions_test4[0] == NULL) { Trace("PALSUITE ERROR: CreateThread(%p, %d, %p, %p, %d, %p) call " - "failed.\nGetLastError returned %d.\n", NULL, 0, &ThreadTest1, - (LPVOID) 0, CREATE_SUSPENDED, &dwThreadId[0], GetLastError()); - LeaveCriticalSection(&CriticalSection); - DeleteCriticalSection ( &CriticalSection ); + "failed.\nGetLastError returned %d.\n", NULL, 0, &ThreadTest1_CriticalSectionFunctions_test4, + (LPVOID) 0, CREATE_SUSPENDED, &dwThreadId_CriticalSectionFunctions_test4[0], GetLastError()); + LeaveCriticalSection(&CriticalSection_CriticalSectionFunctions_test4); + DeleteCriticalSection ( &CriticalSection_CriticalSectionFunctions_test4 ); Fail(""); } - hThread[1] = CreateThread(NULL, + hThread_CriticalSectionFunctions_test4[1] = CreateThread(NULL, 0, - &ThreadTest2, + &ThreadTest2_CriticalSectionFunctions_test4, (LPVOID) 0, CREATE_SUSPENDED, - &dwThreadId[1]); - if (hThread[1] == NULL) + &dwThreadId_CriticalSectionFunctions_test4[1]); + if (hThread_CriticalSectionFunctions_test4[1] == NULL) { Trace("PALSUITE ERROR: CreateThread(%p, %d, %p, %p, %d, %p) call " - "failed.\nGetLastError returned %d.\n", NULL, 0, &ThreadTest2, - (LPVOID) 0, CREATE_SUSPENDED, &dwThreadId[1], GetLastError()); - LeaveCriticalSection(&CriticalSection); + "failed.\nGetLastError returned %d.\n", NULL, 0, &ThreadTest2_CriticalSectionFunctions_test4, + (LPVOID) 0, CREATE_SUSPENDED, &dwThreadId_CriticalSectionFunctions_test4[1], GetLastError()); + LeaveCriticalSection(&CriticalSection_CriticalSectionFunctions_test4); - dwRet = ResumeThread(hThread[0]); + dwRet = ResumeThread(hThread_CriticalSectionFunctions_test4[0]); if (-1 == dwRet) { Trace("PALSUITE ERROR: ResumeThread(%p) call failed.\n" - "GetLastError returned '%d'.\n", hThread[0], + "GetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test4[0], GetLastError()); } - dwRet = WaitForSingleObject(hThread[0], 10000); + dwRet = WaitForSingleObject(hThread_CriticalSectionFunctions_test4[0], 10000); if (WAIT_OBJECT_0 == dwRet) { Trace("PALSUITE ERROR: WaitForSingleObject(%p, %d) call " "failed. '%d' was returned instead of the expected '%d'.\n" - "GetLastError returned '%d'.\n", hThread[0], 10000, dwRet, + "GetLastError returned '%d'.\n", hThread_CriticalSectionFunctions_test4[0], 10000, dwRet, WAIT_OBJECT_0, GetLastError()); } - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test4[0])) { Trace("PALSUITE NOTIFICATION: CloseHandle(%p) call failed.\n" "GetLastError returned %d. Not failing tests.\n", - hThread[0], GetLastError()); + hThread_CriticalSectionFunctions_test4[0], GetLastError()); } - DeleteCriticalSection(&CriticalSection); + DeleteCriticalSection(&CriticalSection_CriticalSectionFunctions_test4); Fail(""); } @@ -137,104 +137,104 @@ int __cdecl main(int argc, char **argv) * Set other thread priorities to be higher than ours & Sleep to ensure * we give up the processor. */ - dwRet = (DWORD) SetThreadPriority(hThread[0], + dwRet = (DWORD) SetThreadPriority(hThread_CriticalSectionFunctions_test4[0], THREAD_PRIORITY_ABOVE_NORMAL); if (0 == dwRet) { Trace("PALSUITE ERROR: SetThreadPriority(%p, %d) call failed.\n" - "GetLastError returned %d", hThread[0], + "GetLastError returned %d", hThread_CriticalSectionFunctions_test4[0], THREAD_PRIORITY_ABOVE_NORMAL, GetLastError()); } - dwRet = (DWORD) SetThreadPriority(hThread[1], + dwRet = (DWORD) SetThreadPriority(hThread_CriticalSectionFunctions_test4[1], THREAD_PRIORITY_ABOVE_NORMAL); if (0 == dwRet) { Trace("PALSUITE ERROR: SetThreadPriority(%p, %d) call failed.\n" - "GetLastError returned %d", hThread[1], + "GetLastError returned %d", hThread_CriticalSectionFunctions_test4[1], THREAD_PRIORITY_ABOVE_NORMAL, GetLastError()); } - dwRet = ResumeThread(hThread[0]); + dwRet = ResumeThread(hThread_CriticalSectionFunctions_test4[0]); if (-1 == dwRet) { Trace("PALSUITE ERROR: ResumeThread(%p, %d) call failed.\n" - "GetLastError returned %d", hThread[0], + "GetLastError returned %d", hThread_CriticalSectionFunctions_test4[0], GetLastError() ); } - dwRet = ResumeThread(hThread[1]); + dwRet = ResumeThread(hThread_CriticalSectionFunctions_test4[1]); if (-1 == dwRet) { Trace("PALSUITE ERROR: ResumeThread(%p, %d) call failed.\n" - "GetLastError returned %d", hThread[0], + "GetLastError returned %d", hThread_CriticalSectionFunctions_test4[0], GetLastError()); } Sleep (0); - LeaveCriticalSection (&CriticalSection); + LeaveCriticalSection (&CriticalSection_CriticalSectionFunctions_test4); - dwRet = WaitForSingleObject(hThread[0], 10000); - dwRet1 = WaitForSingleObject(hThread[1], 10000); + dwRet = WaitForSingleObject(hThread_CriticalSectionFunctions_test4[0], 10000); + dwRet1 = WaitForSingleObject(hThread_CriticalSectionFunctions_test4[1], 10000); if ((WAIT_OBJECT_0 == dwRet) || (WAIT_OBJECT_0 == dwRet1)) { - if ((1 == flags[0] && 0 == flags[1]) || - (0 == flags[0] && 1 == flags[1])) + if ((1 == flags_CriticalSectionFunctions_test4[0] && 0 == flags_CriticalSectionFunctions_test4[1]) || + (0 == flags_CriticalSectionFunctions_test4[0] && 1 == flags_CriticalSectionFunctions_test4[1])) { - bTestResult = PASS; + bTestResult_CriticalSectionFunctions_test4 = PASS; } else { - bTestResult = FAIL; + bTestResult_CriticalSectionFunctions_test4 = FAIL; Trace ("PALSUITE ERROR: flags[%d] = {%d,%d}. These values are" "inconsistent.\nCriticalSection test failed.\n", - NUM_BLOCKING_THREADS, flags[0], flags[1]); + NUM_BLOCKING_THREADS, flags_CriticalSectionFunctions_test4[0], flags_CriticalSectionFunctions_test4[1]); } /* Fail the test if both threads returned WAIT_OBJECT_0 */ if ((WAIT_OBJECT_0 == dwRet) && (WAIT_OBJECT_0 == dwRet1)) { - bTestResult = FAIL; + bTestResult_CriticalSectionFunctions_test4 = FAIL; Trace ("PALSUITE ERROR: WaitForSingleObject(%p, %d) and " "WaitForSingleObject(%p, %d)\nboth returned dwRet = '%d'\n" "One should have returned WAIT_TIMEOUT ('%d').\n", - hThread[0], 10000, hThread[1], 10000, dwRet, WAIT_TIMEOUT); + hThread_CriticalSectionFunctions_test4[0], 10000, hThread_CriticalSectionFunctions_test4[1], 10000, dwRet, WAIT_TIMEOUT); } } else { - bTestResult = FAIL; + bTestResult_CriticalSectionFunctions_test4 = FAIL; Trace ("PALSUITE ERROR: WaitForSingleObject(%p, %d) and " "WaitForSingleObject(%p, %d)\nReturned dwRet = '%d' and\n" - "dwRet1 = '%d' respectively.\n", hThread[0], 10000, hThread[1], + "dwRet1 = '%d' respectively.\n", hThread_CriticalSectionFunctions_test4[0], 10000, hThread_CriticalSectionFunctions_test4[1], 10000, dwRet, dwRet1); } if (WAIT_OBJECT_0 == dwRet) { - if (0 == CloseHandle(hThread[0])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test4[0])) { Trace("PALSUITE NOTIFICATION: CloseHandle(%p) call failed.\n" "GetLastError returned %d. Not failing tests.\n", - hThread[0], GetLastError()); + hThread_CriticalSectionFunctions_test4[0], GetLastError()); } } if (WAIT_OBJECT_0 == dwRet1) { - if (0 == CloseHandle(hThread[1])) + if (0 == CloseHandle(hThread_CriticalSectionFunctions_test4[1])) { Trace("PALSUITE NOTIFICATION: CloseHandle(%p) call failed.\n" "GetLastError returned %d. Not failing tests.\n", - hThread[1], GetLastError()); + hThread_CriticalSectionFunctions_test4[1], GetLastError()); } } /* Leaking the CS on purpose, since there is still a thread waiting on it */ - PAL_TerminateEx(bTestResult); - return (bTestResult); + PAL_TerminateEx(bTestResult_CriticalSectionFunctions_test4); + return (bTestResult_CriticalSectionFunctions_test4); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/testinfo.dat deleted file mode 100644 index c31a70ac427..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = LeaveCriticalSection -Name = Positive test to ensure CRITICAL_SECTION objects are released properly -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to see if threads blocked on a CRITICAL_SECTION object will -= be released in an orderly manner. This case looks at the following -= scenario. If one thread owns a CRITICAL_SECTION object and two threads -= block in EnterCriticalSection, trying to hold the already owned -= CRITICAL_SECTION object, when the first thread releases the CRITICAL_SECTION -= object, will one and only one of the waiters get unblocked? diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt deleted file mode 100644 index 34ff67e6c80..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_criticalsectionfunctions_test5 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test5 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp index c62a75d3f0f..4556c082f67 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp @@ -12,51 +12,7 @@ **===================================================================*/ #include <palsuite.h> -/* - * Tokens 0 and 1 are events. Token 2 is the thread. - */ -#define NUM_TOKENS 3 - -HANDLE hToken[NUM_TOKENS]; -CRITICAL_SECTION CriticalSection; - -BOOL CleanupHelper (HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCHRet; - - bCHRet = CloseHandle(hArray[dwIndex]); - if (!bCHRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCHRet); -} - -BOOL Cleanup(HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCRet; - BOOL bCHRet = FALSE; - - while (--dwIndex > 0) - { - bCHRet = CleanupHelper(&hArray[0], dwIndex); - } - - bCRet = CloseHandle(hArray[0]); - if (!bCRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCRet&&bCHRet); -} - -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test5(LPVOID lpParam) { DWORD dwTRet; @@ -93,7 +49,7 @@ DWORD PALAPI Thread(LPVOID lpParam) return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test5_paltest_criticalsectionfunctions_test5, "threading/CriticalSectionFunctions/test5/paltest_criticalsectionfunctions_test5") { DWORD dwThreadId; DWORD dwMRet; @@ -125,7 +81,7 @@ int __cdecl main(int argc, char **argv) hToken[2] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test5, (LPVOID) NULL, 0, &dwThreadId); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/testinfo.dat deleted file mode 100644 index c35fcf00191..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CriticalSectionFunctions -Name = Positive test for DeleteCriticalSection -TYPE = DEFAULT -EXE1 = test5 -Description -= Attempt to delete a critical section owned by another thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt deleted file mode 100644 index 12f3239d6cb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_criticalsectionfunctions_test6 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test6 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp index b56bde19555..672637159c3 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp @@ -12,51 +12,8 @@ **===================================================================*/ #include <palsuite.h> -/* - * Tokens 0 and 1 are events. Token 2 is the thread. - */ -#define NUM_TOKENS 3 -HANDLE hToken[NUM_TOKENS]; -CRITICAL_SECTION CriticalSection; - -BOOL CleanupHelper (HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCHRet; - - bCHRet = CloseHandle(hArray[dwIndex]); - if (!bCHRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCHRet); -} - -BOOL Cleanup(HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCRet; - BOOL bCHRet; - - while (--dwIndex > 0) - { - bCHRet = CleanupHelper(&hArray[0], dwIndex); - } - - bCRet = CloseHandle(hArray[0]); - if (!bCRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCRet&&bCHRet); -} - -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test6(LPVOID lpParam) { DWORD dwTRet; @@ -93,7 +50,7 @@ DWORD PALAPI Thread(LPVOID lpParam) return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test6_paltest_criticalsectionfunctions_test6, "threading/CriticalSectionFunctions/test6/paltest_criticalsectionfunctions_test6") { DWORD dwThreadId; DWORD dwMRet; @@ -127,7 +84,7 @@ int __cdecl main(int argc, char **argv) hToken[2] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test6, (LPVOID) NULL, 0, &dwThreadId); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/testinfo.dat deleted file mode 100644 index adeb1a18ce9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CriticalSectionFunctions -Name = Positive Test for LeaveCriticalSection -TYPE = DEFAULT -EXE1 = test6 -Description -= Attempt to leave a critical section which is owned by another thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt deleted file mode 100644 index 751bf68e77b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_criticalsectionfunctions_test7 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test7 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp index aa39ad6b4a9..e4ad81364c4 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp @@ -12,51 +12,7 @@ **===================================================================*/ #include <palsuite.h> -/* - * Tokens 0 and 1 are events. Token 2 is the thread. - */ -#define NUM_TOKENS 3 - -HANDLE hToken[NUM_TOKENS]; -CRITICAL_SECTION CriticalSection; - -BOOL CleanupHelper (HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCHRet; - - bCHRet = CloseHandle(hArray[dwIndex]); - if (!bCHRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCHRet); -} - -BOOL Cleanup(HANDLE *hArray, DWORD dwIndex) -{ - BOOL bCRet; - BOOL bCHRet = 0; - - while (--dwIndex > 0) - { - bCHRet = CleanupHelper(&hArray[0], dwIndex); - } - - bCRet = CloseHandle(hArray[0]); - if (!bCRet) - { - Trace("PALSUITE ERROR: Unable to execute CloseHandle(%p) during " - "clean up.\nGetLastError returned '%u'.\n", hArray[dwIndex], - GetLastError()); - } - - return (bCRet&&bCHRet); -} - -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test7(LPVOID lpParam) { DWORD dwTRet; @@ -93,7 +49,7 @@ DWORD PALAPI Thread(LPVOID lpParam) return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test7_paltest_criticalsectionfunctions_test7, "threading/CriticalSectionFunctions/test7/paltest_criticalsectionfunctions_test7") { DWORD dwThreadId; DWORD dwMRet; @@ -127,7 +83,7 @@ int __cdecl main(int argc, char **argv) hToken[2] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test7, (LPVOID) NULL, 0, &dwThreadId); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/testinfo.dat deleted file mode 100644 index a14c248df2a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = CriticalSectionFunctions -Name = Positive test for DeleteCriticalSection -TYPE = DEFAULT -EXE1 = test7 -Description -= Attempt to delete a critical section owned by the current thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt deleted file mode 100644 index a008315da61..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_criticalsectionfunctions_test8 - ${SOURCES} -) - -add_dependencies(paltest_criticalsectionfunctions_test8 coreclrpal) - -target_link_libraries(paltest_criticalsectionfunctions_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp index 239c4d5f345..24f22afa456 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp @@ -27,7 +27,7 @@ volatile LONG g_lCriticalCount = 0; HANDLE g_hEvStart = NULL; CRITICAL_SECTION g_cs; -DWORD PALAPI Thread(LPVOID lpParam) +DWORD PALAPI Thread_CriticalSectionFunctions_test8(LPVOID lpParam) { int i, j, iLpCnt; DWORD dwRet = 0; @@ -109,7 +109,7 @@ DWORD PALAPI Thread(LPVOID lpParam) return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_CriticalSectionFunctions_test8_paltest_criticalsectionfunctions_test8, "threading/CriticalSectionFunctions/test8/paltest_criticalsectionfunctions_test8") { DWORD dwThreadId; DWORD dwRet; @@ -175,7 +175,7 @@ int __cdecl main(int argc, char **argv) { hThreads[iThreadCount] = CreateThread(NULL, 0, - &Thread, + &Thread_CriticalSectionFunctions_test8, (LPVOID) NULL, 0, &dwThreadId); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/thistest.dat b/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/thistest.dat deleted file mode 100644 index 1057eca5c57..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/thistest.dat +++ /dev/null @@ -1,2 +0,0 @@ - -PAL,threading,palsuite\threading\criticalsectionfunctions\test8,Test8forCriticalSectionFunctionalities=test8.c, diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp index 7e86ba15e1b..fad9e2b1c08 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp @@ -25,11 +25,13 @@ #define GETCALLCOUNT "_GetCallCount@0" #endif -DWORD PALAPI ThreadFunc(LPVOID lpParam); -int RunTest(int DisableThreadCalls); +DWORD PALAPI ThreadFunc_DisableThreadLibraryCalls_test1(LPVOID lpParam); +int RunTest_DisableThreadLibraryCalls_test1(int DisableThreadCalls); -int __cdecl main(int argc, char **argv) -{ +int __cdecl threading_DisableThreadLibraryCalls_test1(int argc, char* argv[]); +static PALTest threading_DisableThreadLibraryCalls_test1_lookup(threading_DisableThreadLibraryCalls_test1, "threading/DisableThreadLibraryCalls/test1"); +int __cdecl threading_DisableThreadLibraryCalls_test1(int argc, char* argv[]) +{ int ret; if ((PAL_Initialize(argc,argv)) != 0) @@ -54,7 +56,7 @@ int __cdecl main(int argc, char **argv) * Test once without calling DisableThreadLibraryCalls and make sure we * get expected results. */ - ret = RunTest(0); + ret = RunTest_DisableThreadLibraryCalls_test1(0); if (ret != 2) { Fail("Expected to get 2 thread library calls, got %d!\n", ret); @@ -64,7 +66,7 @@ int __cdecl main(int argc, char **argv) /* * Test again, this time calling DisableThreadLibraryCalls. */ - ret = RunTest(1); + ret = RunTest_DisableThreadLibraryCalls_test1(1); if (ret != 0) { Fail("Expected to get 0 thread library calls, got %d!\n", ret); @@ -77,7 +79,7 @@ int __cdecl main(int argc, char **argv) /* * Thread entry point. Doesn't do anything. */ -DWORD PALAPI ThreadFunc(LPVOID lpParam) +DWORD PALAPI ThreadFunc_DisableThreadLibraryCalls_test1(LPVOID lpParam) { return 0; } @@ -115,7 +117,7 @@ int RunTest(int DisableThreadCalls) } } - hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) ThreadFunc, + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) ThreadFunc_DisableThreadLibraryCalls_test1, NULL, 0, &threadID); if (hThread == NULL) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp index 448db98b8a6..58fb4429f7a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp @@ -46,7 +46,7 @@ typedef int ( PALAPI *LPTESTFUNC )( void ); * * Dummy thread function for causing DLL thread notifications. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_DisableThreadLibraryCalls_test2( LPVOID param ) { /* simulate some brief "work" */ int i; @@ -145,7 +145,7 @@ int __cdecl main( int argc, char **argv ) /* run another dummy thread to cause notification of the libraries */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_DisableThreadLibraryCalls_test2, /* thread function */ (LPVOID) NULL, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/CMakeLists.txt deleted file mode 100644 index 21851e4c1e3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt deleted file mode 100644 index ddf7ca846ed..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_duplicatehandle_test1 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test1 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp index 15c0c22f77a..241499e4d1c 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp @@ -14,7 +14,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test1_paltest_duplicatehandle_test1, "threading/DuplicateHandle/test1/paltest_duplicatehandle_test1") { HANDLE hFile; HANDLE hDupFile; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/testinfo.dat deleted file mode 100644 index c19896bb418..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Positive Test for DuplicateHandle -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This test will create two handles to file, one to write and -= one to read what was written. Test on a closed handle and a -= NULL handle, both should fail. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt deleted file mode 100644 index 8a2b02bfd93..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test10.cpp -) - -add_executable(paltest_duplicatehandle_test10 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test10 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test10 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp index 0abbc378e70..2f1d27dec63 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp @@ -22,11 +22,11 @@ enum wait_results }; -volatile int t1_result=WR_WAITING; -volatile int t2_result=WR_WAITING; +volatile int t1_result_DuplicateHandle_test10=WR_WAITING; +volatile int t2_result_DuplicateHandle_test10=WR_WAITING; -DWORD PALAPI ThreadTest1(LPVOID lpParam) +DWORD PALAPI ThreadTest1_DuplicateHandle_test10(LPVOID lpParam) { DWORD dwWait; @@ -34,24 +34,24 @@ DWORD PALAPI ThreadTest1(LPVOID lpParam) if (dwWait == WAIT_OBJECT_0) { /* tell the main thread we got the mutex */ - t1_result=WR_GOT_MUTEX; + t1_result_DuplicateHandle_test10=WR_GOT_MUTEX; /* wait for main thread to tell us to release the mutex */ - while(WR_GOT_MUTEX == t1_result) + while(WR_GOT_MUTEX == t1_result_DuplicateHandle_test10) Sleep(1); ReleaseSemaphore((HANDLE)lpParam, 1, NULL); /* tell the main thread we released the mutex */ - t1_result = WR_RELEASED; + t1_result_DuplicateHandle_test10 = WR_RELEASED; } else { - t1_result = WR_TIMED_OUT; + t1_result_DuplicateHandle_test10 = WR_TIMED_OUT; } return 0; } -DWORD PALAPI ThreadTest2(LPVOID lpParam) +DWORD PALAPI ThreadTest2_DuplicateHandle_test10(LPVOID lpParam) { DWORD dwWait; @@ -59,18 +59,18 @@ DWORD PALAPI ThreadTest2(LPVOID lpParam) if (dwWait == WAIT_OBJECT_0) { ReleaseSemaphore((HANDLE)lpParam, 1, NULL); - t2_result = WR_GOT_MUTEX; + t2_result_DuplicateHandle_test10 = WR_GOT_MUTEX; } else { - t2_result = WR_TIMED_OUT; + t2_result_DuplicateHandle_test10 = WR_TIMED_OUT; } return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test10_paltest_duplicatehandle_test10, "threading/DuplicateHandle/test10/paltest_duplicatehandle_test10") { HANDLE hDupSemaphore; @@ -118,7 +118,7 @@ int __cdecl main(int argc, char **argv) /*Create a thread to test the Semaphore*/ hThread = CreateThread(NULL, 0, - &ThreadTest1, + &ThreadTest1_DuplicateHandle_test10, hSemaphore, 0, &dwThreadId); @@ -132,10 +132,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has taken the mutex */ - while (WR_WAITING == t1_result) + while (WR_WAITING == t1_result_DuplicateHandle_test10) Sleep(1); - if(WR_TIMED_OUT == t1_result) + if(WR_TIMED_OUT == t1_result_DuplicateHandle_test10) { Trace("PALSUITE ERROR: %u: thread couldn't acquire the semaphore\n", GetLastError()); @@ -150,7 +150,7 @@ int __cdecl main(int argc, char **argv) thread*/ hThread2 = CreateThread(NULL, 0, - &ThreadTest2, + &ThreadTest2_DuplicateHandle_test10, hDupSemaphore, 0, &dwThreadId); @@ -166,10 +166,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has tried to take the mutex */ - while (WR_WAITING == t2_result) + while (WR_WAITING == t2_result_DuplicateHandle_test10) Sleep(1); - - if (WR_TIMED_OUT != t2_result ) + + if (WR_TIMED_OUT != t2_result_DuplicateHandle_test10 ) { Trace("PALSUITE ERROR:%u: Able to take mutex %#x while its " "duplicate %#x is held\n", GetLastError(), hDupSemaphore, @@ -182,13 +182,13 @@ int __cdecl main(int argc, char **argv) } /* reset second thread status */ - t2_result = WR_WAITING; + t2_result_DuplicateHandle_test10 = WR_WAITING; /* tell thread 1 to release the mutex */ - t1_result = WR_WAITING; + t1_result_DuplicateHandle_test10 = WR_WAITING; /* wait for thread 1 to release the mutex */ - while (WR_WAITING == t1_result) + while (WR_WAITING == t1_result_DuplicateHandle_test10) Sleep(1); CloseHandle(hThread2); @@ -198,7 +198,7 @@ int __cdecl main(int argc, char **argv) put WR_GOT_MUTEX into t2_result */ hThread2 = CreateThread(NULL, 0, - &ThreadTest2, + &ThreadTest2_DuplicateHandle_test10, hDupSemaphore, 0, &dwThreadId); @@ -214,10 +214,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has taken the semaphore */ - while (WR_WAITING == t2_result) + while (WR_WAITING == t2_result_DuplicateHandle_test10) Sleep(1); - - if (WR_GOT_MUTEX != t2_result ) + + if (WR_GOT_MUTEX != t2_result_DuplicateHandle_test10 ) { Trace("PALSUITE ERROR:%u: Unable to take semaphore %#x after its" " duplicate %#x was released\n", GetLastError(), hDupSemaphore, diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/testinfo.dat deleted file mode 100644 index 875ab4f503f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test10/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (CreateSemaphore) -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This test duplication of a Semaphore handle. The test will -= create a Semaphore and duplicate a handle to it. -= Then two subthreads will be used to verify that they can selectively -= block each other with different handles that refer to the -= same Semaphore diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt deleted file mode 100644 index e30228a511e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test11.cpp -) - -add_executable(paltest_duplicatehandle_test11 - ${TESTSOURCES} -) - -add_dependencies(paltest_duplicatehandle_test11 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test11 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childprocess.cpp -) - -add_executable(paltest_duplicatehandle_test11_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_duplicatehandle_test11_child coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test11_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp index 7ec6bcd0531..aafa76918ee 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp @@ -20,7 +20,7 @@ #include "myexitcode.h" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_DuplicateHandle_test11_paltest_duplicatehandle_test11_child, "threading/DuplicateHandle/test11/paltest_duplicatehandle_test11_child") { HANDLE hMutex; WCHAR wszMutexName[] = { 'T','E','S','T','1','1','\0' }; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp index 0727dac2691..2efe1c66fb5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp @@ -35,40 +35,7 @@ #include <palsuite.h> #include "myexitcode.h" - -static const char* rgchPathDelim = "\\"; - - -int -mkAbsoluteFilename( LPSTR dirName, - DWORD dwDirLength, - LPCSTR fileName, - DWORD dwFileLength, - LPSTR absPathName ) -{ - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = strlen( dirName ); - sizeFN = strlen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - strncpy( absPathName, dirName, dwDirLength +1 ); - strncpy( absPathName, rgchPathDelim, 2 ); - strncpy( absPathName, fileName, dwFileLength +1 ); - - return (sizeAPN); - -} - - -int __cdecl main( int argc, char **argv ) - +PALTEST(threading_DuplicateHandle_test11_paltest_duplicatehandle_test11, "threading/DuplicateHandle/test11/paltest_duplicatehandle_test11") { const char* rgchChildFile = "childprocess"; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/testinfo.dat deleted file mode 100644 index b671dd6e60e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test11/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = DuplicateHandle -Name = Test for DuplicateHandle -TYPE = DEFAULT -EXE1 = test11 -EXE2 = childprocess -Description -= Test to ensure proper operation of the DuplicateHandle API. -= The test launches a trivial child process, then opens -= a handle to it using OpenProcess. It then duplicates that -= handle and uses it to wait for the child process to terminate, -= and then checks the exit code of the child process in order to -= verify that it was in fact a handle to the correct= process. The test tries to duplicate the handle again after -= the process has been closed, to verify that failure ensues. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt deleted file mode 100644 index d83e46e6da8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test12.cpp -) - -add_executable(paltest_duplicatehandle_test12 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test12 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test12 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp index e600c5e1d00..9711a3375ed 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp @@ -13,7 +13,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test12_paltest_duplicatehandle_test12, "threading/DuplicateHandle/test12/paltest_duplicatehandle_test12") { HANDLE hFile; HANDLE hDupFile; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/testinfo.dat deleted file mode 100644 index 93bc1a64d75..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test12/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Positive Test for DuplicateHandle -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This test will create handle to file (to write), -= then call duplicate handle, and close the original handle -= and then use duplicated handle to read what was written. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt deleted file mode 100644 index e962a1191a3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_duplicatehandle_test2 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test2 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp index 9554b17118f..ed766202189 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp @@ -16,7 +16,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test2_paltest_duplicatehandle_test2, "threading/DuplicateHandle/test2/paltest_duplicatehandle_test2") { HANDLE hEvent; HANDLE hDupEvent; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/testinfo.dat deleted file mode 100644 index df07a395ac4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test2/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This will test duplication of an CreateEvent handle. Test an -= event in a signaled state to wait, and then set the duplicate -= to nonsignaled state and perform the wait again. The wait on -= the event should fail. Test the duplication of closed and NULL -= events, these should fail. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt deleted file mode 100644 index 172616ad402..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_duplicatehandle_test3 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test3 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp index 206438d22ad..4852648471a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp @@ -16,7 +16,7 @@ **===================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test3_paltest_duplicatehandle_test3, "threading/DuplicateHandle/test3/paltest_duplicatehandle_test3") { HANDLE hCreateEvent; HANDLE hOpenEvent; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/testinfo.dat deleted file mode 100644 index 61ff7c89788..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test3/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This will test duplication of an OpenEvent handle. Test an -= event in a signaled state to wait, and then set the duplicate -= to nonsignaled state and perform the wait again. The wait on -= the event should fail. Test the duplication of closed and NULL -= events, these should fail. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt deleted file mode 100644 index 605365d3efc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_duplicatehandle_test4 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test4 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp index c1854cd370b..e489f54aa5f 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp @@ -27,11 +27,11 @@ enum wait_results }; -volatile int t1_result=WR_WAITING; -volatile int t2_result=WR_WAITING; +volatile int t1_result_DuplicateHandle_test4=WR_WAITING; +volatile int t2_result_DuplicateHandle_test4=WR_WAITING; -DWORD PALAPI ThreadTest1(LPVOID lpParam) +DWORD PALAPI ThreadTest1_DuplicateHandle_test4(LPVOID lpParam) { DWORD dwWait; @@ -39,24 +39,24 @@ DWORD PALAPI ThreadTest1(LPVOID lpParam) if (dwWait == WAIT_OBJECT_0) { /* tell the main thread we got the mutex */ - t1_result=WR_GOT_MUTEX; + t1_result_DuplicateHandle_test4=WR_GOT_MUTEX; /* wait for main thread to tell us to release the mutex */ - while(WR_GOT_MUTEX == t1_result) + while(WR_GOT_MUTEX == t1_result_DuplicateHandle_test4) Sleep(1); ReleaseMutex((HANDLE)lpParam); /* tell the main thread we released the mutex */ - t1_result = WR_RELEASED; + t1_result_DuplicateHandle_test4 = WR_RELEASED; } else { - t1_result = WR_TIMED_OUT; + t1_result_DuplicateHandle_test4 = WR_TIMED_OUT; } return 0; } -DWORD PALAPI ThreadTest2(LPVOID lpParam) +DWORD PALAPI ThreadTest2_DuplicateHandle_test4(LPVOID lpParam) { DWORD dwWait; @@ -64,18 +64,18 @@ DWORD PALAPI ThreadTest2(LPVOID lpParam) if (dwWait == WAIT_OBJECT_0) { ReleaseMutex((HANDLE)lpParam); - t2_result = WR_GOT_MUTEX; + t2_result_DuplicateHandle_test4 = WR_GOT_MUTEX; } else { - t2_result = WR_TIMED_OUT; + t2_result_DuplicateHandle_test4 = WR_TIMED_OUT; } return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test4_paltest_duplicatehandle_test4, "threading/DuplicateHandle/test4/paltest_duplicatehandle_test4") { HANDLE hDupMutex; @@ -121,7 +121,7 @@ int __cdecl main(int argc, char **argv) /*Create a thread to test the Mutex*/ hThread = CreateThread(NULL, 0, - &ThreadTest1, + &ThreadTest1_DuplicateHandle_test4, hMutex, 0, &dwThreadId); @@ -135,10 +135,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has taken the mutex */ - while (WR_WAITING == t1_result) + while (WR_WAITING == t1_result_DuplicateHandle_test4) Sleep(1); - if(WR_TIMED_OUT == t1_result) + if(WR_TIMED_OUT == t1_result_DuplicateHandle_test4) { Trace("ERROR: %u: thread 1 couldn't acquire the mutex\n"); CloseHandle(hMutex); @@ -151,7 +151,7 @@ int __cdecl main(int argc, char **argv) /*This should fail since the Mutex is owned hThread*/ hThread2 = CreateThread(NULL, 0, - &ThreadTest2, + &ThreadTest2_DuplicateHandle_test4, hDupMutex, 0, &dwThreadId); @@ -167,10 +167,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has tried to take the mutex */ - while (WR_WAITING == t2_result) + while (WR_WAITING == t2_result_DuplicateHandle_test4) Sleep(1); - if (WR_TIMED_OUT != t2_result ) + if (WR_TIMED_OUT != t2_result_DuplicateHandle_test4 ) { Trace("ERROR:%u: Able to take mutex %#x while its duplicate %#x is " "held\n", hDupMutex, hMutex); @@ -182,13 +182,13 @@ int __cdecl main(int argc, char **argv) } /* reset second thread status */ - t2_result = WR_WAITING; + t2_result_DuplicateHandle_test4 = WR_WAITING; /* tell thread 1 to release the mutex */ - t1_result = WR_WAITING; + t1_result_DuplicateHandle_test4 = WR_WAITING; /* wait for thread 1 to release the mutex */ - while (WR_WAITING == t1_result) + while (WR_WAITING == t1_result_DuplicateHandle_test4) Sleep(1); CloseHandle(hThread2); @@ -197,7 +197,7 @@ int __cdecl main(int argc, char **argv) /*This test should pass, the Mutex has since been released*/ hThread2 = CreateThread(NULL, 0, - &ThreadTest2, + &ThreadTest2_DuplicateHandle_test4, hDupMutex, 0, &dwThreadId); @@ -213,10 +213,10 @@ int __cdecl main(int argc, char **argv) } /* wait until thread has taken the mutex */ - while (WR_WAITING == t2_result) + while (WR_WAITING == t2_result_DuplicateHandle_test4) Sleep(1); - if (WR_GOT_MUTEX != t2_result ) + if (WR_GOT_MUTEX != t2_result_DuplicateHandle_test4 ) { Trace("ERROR:%u: Unable to take mutex %#x after its duplicate %#x was " "released\n", hDupMutex, hMutex); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/testinfo.dat deleted file mode 100644 index accb1352699..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test4/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (CreateMutex) -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the DuplicateHandle function. -= This test duplication of a Mutex handle. The test will comprise -= of creating a Mutex and its duplicate and create a thread that will -= get ownership. Another thread will be create that will attempt to -= get ownership of the duplicate Mutex, this will fail, since the -= Mutex is owned by another thread. The Mutex will be released and -= then the thread will attempt to get ownership of the duplicate -= Mutex, this will succeed. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt deleted file mode 100644 index 9f4b8aa17d6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_duplicatehandle_test5 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test5 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp index a9eaa62daa3..1a21d6f3ccc 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp @@ -19,9 +19,9 @@ #include <palsuite.h> -const char* cTestString = "one fish, two fish, red fish, blue fish."; +#define cTestString "one fish, two fish, read fish, blue fish." -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test5_paltest_duplicatehandle_test5, "threading/DuplicateHandle/test5/paltest_duplicatehandle_test5") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/testinfo.dat deleted file mode 100644 index 142a4674b98..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test5/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (CreatePipe) -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the PAL implementation of the DuplicateHandle function, -= with CreatePipe. This test will create a pipe and write to it, -= then duplicate the read handle and read what was written. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt deleted file mode 100644 index fa37e1c0e76..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_duplicatehandle_test6 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test6 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp index a6a1b1f2579..f3ceac6a2ba 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp @@ -20,9 +20,9 @@ #include <palsuite.h> -const char* cTestString = "one fish, two fish, red fish, blue fish."; +#define cTestString "one fish, two fish, read fish, blue fish." -int __cdecl main(int argc, char **argv) +PALTEST(threading_DuplicateHandle_test6_paltest_duplicatehandle_test6, "threading/DuplicateHandle/test6/paltest_duplicatehandle_test6") { HANDLE hReadPipe = NULL; HANDLE hWritePipe = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/testinfo.dat deleted file mode 100644 index 6ad1cf89f64..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (CreatePipe) -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the DuplicateHandle function, -= with CreatePipe. This test will create a pipe, then duplicate -= the write handle, write to the handle, and use the read to -= verify. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt deleted file mode 100644 index d3be5f2e5ed..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_duplicatehandle_test7 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test7 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp index fa2f6c36363..d50b1bfb27c 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp @@ -16,14 +16,14 @@ #include <palsuite.h> -DWORD PALAPI CreateTestThread(LPVOID lpParam); +DWORD PALAPI CreateTestThread_DuplicateHandle_test7(LPVOID lpParam); -int __cdecl main(int argc, char* argv[]) +PALTEST(threading_DuplicateHandle_test7_paltest_duplicatehandle_test7, "threading/DuplicateHandle/test7/paltest_duplicatehandle_test7") { HANDLE hThread; HANDLE hDupThread; DWORD dwThreadId = 0; - LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread; + LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread_DuplicateHandle_test7; HANDLE hSyncEvent; int threadPriority; @@ -165,7 +165,7 @@ int __cdecl main(int argc, char* argv[]) } /*Thread testing function*/ -DWORD PALAPI CreateTestThread(LPVOID lpParam) +DWORD PALAPI CreateTestThread_DuplicateHandle_test7(LPVOID lpParam) { HANDLE hSyncEvent = (HANDLE)lpParam; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/testinfo.dat deleted file mode 100644 index d10d857c7db..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test7/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (CreateThread) -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the DuplicateHandle function, -= with a handle from CreateThread. The test will create a thread -= handle and its duplicate. Then get the priorities of the threads, -= set the priority of one and the change should be seen in the -= other. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt deleted file mode 100644 index 60ebe7a785b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test8.cpp -) - -add_executable(paltest_duplicatehandle_test8 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test8 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test8 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp index 47083e3cd0f..e90fcd43f4b 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp @@ -16,15 +16,15 @@ #include <palsuite.h> -DWORD PALAPI CreateTestThread(LPVOID lpParam); +DWORD PALAPI CreateTestThread_DuplicateHandle_test8(LPVOID lpParam); -int __cdecl main(int argc, char* argv[]) +PALTEST(threading_DuplicateHandle_test8_paltest_duplicatehandle_test8, "threading/DuplicateHandle/test8/paltest_duplicatehandle_test8") { HANDLE hThread; HANDLE hCurrentThread; HANDLE hDupThread; DWORD dwThreadId = 0; - LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread; + LPTHREAD_START_ROUTINE lpStartAddress = &CreateTestThread_DuplicateHandle_test8; int threadPriority; int duplicatePriority; @@ -157,7 +157,7 @@ int __cdecl main(int argc, char* argv[]) } /*Thread testing function, only return '0'*/ -DWORD PALAPI CreateTestThread(LPVOID lpParam) +DWORD PALAPI CreateTestThread_DuplicateHandle_test8(LPVOID lpParam) { return (DWORD)0; } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/testinfo.dat deleted file mode 100644 index 5340ffe92fa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test8/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (GetCurrentThread) -TYPE = DEFAULT -EXE1 = test8 -Description -=Tests the PAL implementation of the DuplicateHandle function, -=with a handle from GetCurrentThread. The test will create a thread -=handle, get the current thread and its duplicate. Then get the -=priorities of the threads, set the priority of one and the change -=should be seen in the other. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt deleted file mode 100644 index 96aee8c926a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test9.cpp -) - -add_executable(paltest_duplicatehandle_test9 - ${SOURCES} -) - -add_dependencies(paltest_duplicatehandle_test9 coreclrpal) - -target_link_libraries(paltest_duplicatehandle_test9 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp index c223f9a4a6e..e5a0abcc6cf 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp @@ -17,7 +17,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char* argv[]) +PALTEST(threading_DuplicateHandle_test9_paltest_duplicatehandle_test9, "threading/DuplicateHandle/test9/paltest_duplicatehandle_test9") { HANDLE hProcess; HANDLE hDupProcess; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/testinfo.dat deleted file mode 100644 index 179eabc13ba..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/DuplicateHandle/test9/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = DuplicateHandle -Name = Test for DuplicateHandle (GetCurrentProcess) -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the DuplicateHandle function, -= with a handle from GetCurrentProcess. The test will create a -= process, duplicate it, then using ReadProcessMemory will -= read from the memory location of the CreateProcess process -= memory and the DuplicateHandle process memory. If the -= duplication is correct the memory will be the same for both. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/CMakeLists.txt deleted file mode 100644 index d243b82668a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt deleted file mode 100644 index 2aae5fa1672..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ExitProcess.cpp -) - -add_executable(paltest_exitprocess_test1 - ${SOURCES} -) - -add_dependencies(paltest_exitprocess_test1 coreclrpal) - -target_link_libraries(paltest_exitprocess_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp index 74e41afe351..b25a54f804a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ExitProcess_test1_paltest_exitprocess_test1, "threading/ExitProcess/test1/paltest_exitprocess_test1") { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/testinfo.dat deleted file mode 100644 index 61906c78393..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ExitProcess -Name = Positive Test for ExitProcess -TYPE = DEFAULT -EXE1 = exitprocess -Description -= Test the ExitProcess function. The test runs the ExitProcess function -= with the TEST_RETURN enumeration value PASS diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt deleted file mode 100644 index e9022f892ac..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_exitprocess_test2 - ${SOURCES} -) - -add_dependencies(paltest_exitprocess_test2 coreclrpal) - -target_link_libraries(paltest_exitprocess_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp index 58698c1dc86..0fa74fcbed2 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp @@ -16,7 +16,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ExitProcess_test2_paltest_exitprocess_test2, "threading/ExitProcess/test2/paltest_exitprocess_test2") { /* call ExitProcess() -- should work without PAL_Initialize() */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/testinfo.dat deleted file mode 100644 index 0a1dd2be8c8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ExitProcess -Name = Positive test for ExitProcess -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the ExitProcess() -= API by ensuring it works before PAL_Initialize() is -= called. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt deleted file mode 100644 index c4ede3cf893..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_exitprocess_test3 - ${SOURCES} -) - -add_dependencies(paltest_exitprocess_test3 coreclrpal) - -target_link_libraries(paltest_exitprocess_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp index 6b3f4afc538..74671b3a21c 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp @@ -17,7 +17,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ExitProcess_test3_paltest_exitprocess_test3, "threading/ExitProcess/test3/paltest_exitprocess_test3") { /* initialize the PAL */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/testinfo.dat deleted file mode 100644 index 3bdc45cd2d5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitProcess/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ExitProcess -Name = Positive test for ExitProcess -TYPE = DEFAULT -EXE1 = test3 -Description -= Test to ensure proper operation of the ExitProcess() -= API by ensuring it works after PAL_Terminate() is -= called. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt deleted file mode 100644 index 710ddaa6dd6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_exitthread_test1 - ${SOURCES} -) - -add_dependencies(paltest_exitthread_test1 coreclrpal) - -target_link_libraries(paltest_exitthread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp index 9cdfe6fcde6..084ddc504b4 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp @@ -96,7 +96,7 @@ BOOL ExitThreadTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_ExitThread_test1_paltest_exitthread_test1, "threading/ExitThread/test1/paltest_exitthread_test1") { if(0 != (PAL_Initialize(argc, argv))) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/testinfo.dat deleted file mode 100644 index 7b1f6cdec30..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ExitThread -Name = Positive Test for ExitThread -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for ExitThread. Create a thread and then call -= exit thread within the threading function. Ensure that it exits -= immediatly. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt deleted file mode 100644 index 5a3d672594c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test2.cpp -) - -add_executable(paltest_exitthread_test2 - ${TESTSOURCES} -) - -add_dependencies(paltest_exitthread_test2 coreclrpal) - -target_link_libraries(paltest_exitthread_test2 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childprocess.cpp -) - -add_executable(paltest_exitthread_test2_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_exitthread_test2_child coreclrpal) - -target_link_libraries(paltest_exitthread_test2_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp index ea439628ad9..2cd743fbd37 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> #include "myexitcode.h" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ExitThread_test2_paltest_exitthread_test2_child, "threading/ExitThread/test2/paltest_exitthread_test2_child") { /* initialize the PAL */ if( PAL_Initialize(argc, argv) != 0 ) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp index 8226e674905..4b9418d859e 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp @@ -26,40 +26,7 @@ #include <palsuite.h> #include "myexitcode.h" - -static const char* rgchPathDelim = "\\"; - - -int -mkAbsoluteFilename( LPSTR dirName, - DWORD dwDirLength, - LPCSTR fileName, - DWORD dwFileLength, - LPSTR absPathName ) -{ - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = strlen( dirName ); - sizeFN = strlen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - strncpy( absPathName, dirName, dwDirLength +1 ); - strncpy( absPathName, rgchPathDelim, 2 ); - strncpy( absPathName, fileName, dwFileLength +1 ); - - return (sizeAPN); - -} - - -int __cdecl main( int argc, char **argv ) - +PALTEST(threading_ExitThread_test2_paltest_exitthread_test2, "threading/ExitThread/test2/paltest_exitthread_test2") { const char* rgchChildFile = "childprocess"; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/testinfo.dat deleted file mode 100644 index dbda37f8246..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test2/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ExitThread -Name = Test for ExitThread -TYPE = DEFAULT -EXE1 = test2 -EXE2 = childprocess -Description -= Test to ensure proper operation of the ExitThread -= API. This test launches a simple child process that exits -= by calling ExitThread() with a known value, and checks -= that the correct value is returned to the parent process. -= This verifies that when the last thread of a process exits -= via ExitThread, the process exits with the proper return -= code. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp index 034bbf48be9..473edde728e 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp @@ -47,7 +47,7 @@ typedef int ( PALAPI *LPTESTFUNC )( void ); * * Dummy thread function for causing DLL thread notifications. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_ExitThread_test3( LPVOID param ) { /* simulate some brief "work" */ int i; @@ -108,7 +108,7 @@ int __cdecl main( int argc, char **argv ) /* run another dummy thread to cause notification of the library */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_ExitThread_test3, /* thread function */ (LPVOID) NULL, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt deleted file mode 100644 index 3a8efb8abc1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - process.cpp -) - -add_executable(paltest_getcurrentprocess_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentprocess_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentprocess_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp index 4a05dc80b29..b7708d024fe 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -INT __cdecl main( int argc, char **argv ) +PALTEST(threading_GetCurrentProcess_test1_paltest_getcurrentprocess_test1, "threading/GetCurrentProcess/test1/paltest_getcurrentprocess_test1") { HANDLE hProcess; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/testinfo.dat deleted file mode 100644 index f930e4c75db..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetCurrentProcess -Name = Positive Test for GetCurrentProcess -TYPE = DEFAULT -EXE1 = process -Description -= Test to see if the function GetCurrentProcess returns a handle to the -= current process or not. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt deleted file mode 100644 index bb650f96070..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - processId.cpp -) - -add_executable(paltest_getcurrentprocessid_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentprocessid_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentprocessid_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp index 87929201385..57dc8818faa 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -INT __cdecl main( int argc, char **argv ) +PALTEST(threading_GetCurrentProcessId_test1_paltest_getcurrentprocessid_test1, "threading/GetCurrentProcessId/test1/paltest_getcurrentprocessid_test1") { DWORD dwProcessId; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/testinfo.dat deleted file mode 100644 index 8bdc0e414de..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetCurrentProcessId -Name = Positive Test for GetCurrentProcessId -TYPE = DEFAULT -EXE1 = processid -Description -= Test to ensure GetCurrentProcessId returns the current process id number. -= This test compares the result of GetCurrentProcessId to getpid. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt deleted file mode 100644 index aba630f0fb9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - thread.cpp -) - -add_executable(paltest_getcurrentthread_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentthread_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentthread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/testinfo.dat deleted file mode 100644 index c11cba188f5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetCurrentThread -Name = Positive Test for GetCurrentThread -TYPE = DEFAULT -EXE1 = thread -Description -= Test to ensure GetCurrentThread returns a handle to the current thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp index d19e18f9036..c0e4f25203a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main( int argc, char **argv ) +PALTEST(threading_GetCurrentThread_test1_paltest_getcurrentthread_test1, "threading/GetCurrentThread/test1/paltest_getcurrentthread_test1") { HANDLE hThread; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt deleted file mode 100644 index b73f90e271a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getcurrentthread_test2 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentthread_test2 coreclrpal) - -target_link_libraries(paltest_getcurrentthread_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp index 3598437b442..ad5d5c27a38 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp @@ -42,7 +42,7 @@ static int g_priority = 0; * Thread function that calls GetCurrentThread() to get a pseudo-handle * to itself, then checks its priority and exits with that value. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_GetCurrentThread_test2( LPVOID param ) { int priority; HANDLE hThread; @@ -75,7 +75,7 @@ DWORD PALAPI ThreadFunc( LPVOID param ) * * executable entry point */ -INT __cdecl main( INT argc, CHAR **argv ) +PALTEST(threading_GetCurrentThread_test2_paltest_getcurrentthread_test2, "threading/GetCurrentThread/test2/paltest_getcurrentthread_test2") { HANDLE hThread = NULL; DWORD IDThread; @@ -98,7 +98,7 @@ INT __cdecl main( INT argc, CHAR **argv ) /* Create multiple threads. */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_GetCurrentThread_test2, /* thread function */ (LPVOID) i, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/testinfo.dat deleted file mode 100644 index 437dcfcdc0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThread/test2/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetCurrentThread -Name = Test for GetCurrentThread -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the GetCurrentThread() -= API. The test launches a thread in suspended mode, and sets -= its priority to a non-default value using the handle returned -= by CreateThread(). The new thread calls GetCurrentThred() to -= retrieve a handle to itself, and calls GetThreadPriority() -= to verify that its priority matches what it was set to on -= the main execution thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt deleted file mode 100644 index 93ddf44a36c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - threadId.cpp -) - -add_executable(paltest_getcurrentthreadid_test1 - ${SOURCES} -) - -add_dependencies(paltest_getcurrentthreadid_test1 coreclrpal) - -target_link_libraries(paltest_getcurrentthreadid_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/testinfo.dat deleted file mode 100644 index 44dec989648..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetCurrentThreadId -Name = Positive Test for GetCurrentThreadId -TYPE = DEFAULT -EXE1 = threadid -Description -= Test to ensure GetCurrentThreadId returns the threadId of the current -= thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp index 8288f93aa70..e8c90ebd955 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp @@ -28,7 +28,7 @@ DWORD PALAPI ThreadFunction ( LPVOID lpParam ) return 0; } -int __cdecl main( int argc, char **argv ) +PALTEST(threading_GetCurrentThreadId_test1_paltest_getcurrentthreadid_test1, "threading/GetCurrentThreadId/test1/paltest_getcurrentthreadid_test1") { extern DWORD dwThreadIdTF; DWORD dwThreadIdCT; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt deleted file mode 100644 index 2cf8b3c0d68..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test1.cpp -) - -add_executable(paltest_getexitcodeprocess_test1 - ${TESTSOURCES} -) - -add_dependencies(paltest_getexitcodeprocess_test1 coreclrpal) - -target_link_libraries(paltest_getexitcodeprocess_test1 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childProcess.cpp -) - -add_executable(paltest_getexitcodeprocess_test1_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_getexitcodeprocess_test1_child coreclrpal) - -target_link_libraries(paltest_getexitcodeprocess_test1_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp index 4ee5f0a194b..4848bb49980 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp @@ -16,8 +16,9 @@ #include <pal.h> #include "myexitcode.h" +#include <palsuite.h> -int __cdecl main( int argc, char **argv ) +PALTEST(threading_GetExitCodeProcess_test1_paltest_getexitcodeprocess_test1_child, "threading/GetExitCodeProcess/test1/paltest_getexitcodeprocess_test1_child") { int i; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp index b83e021bde2..cfce4169bf5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp @@ -24,40 +24,7 @@ #include <palsuite.h> #include "myexitcode.h" - -static const char* rgchPathDelim = "\\"; - - -int -mkAbsoluteFilename( LPSTR dirName, - DWORD dwDirLength, - LPCSTR fileName, - DWORD dwFileLength, - LPSTR absPathName ) -{ - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = strlen( dirName ); - sizeFN = strlen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - strncpy( absPathName, dirName, dwDirLength +1 ); - strncpy( absPathName, rgchPathDelim, 2 ); - strncpy( absPathName, fileName, dwFileLength +1 ); - - return (sizeAPN); - -} - - -int __cdecl main( int argc, char **argv ) - +PALTEST(threading_GetExitCodeProcess_test1_paltest_getexitcodeprocess_test1, "threading/GetExitCodeProcess/test1/paltest_getexitcodeprocess_test1") { const char* rgchChildFile = "childprocess"; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/testinfo.dat deleted file mode 100644 index b015aee999a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetExitCodeProcess -Name = Test for GetExitCodeProcess -TYPE = DEFAULT -EXE1 = test1 -EXE2 = childprocess -Description -= Test to ensure proper operation of the GetExitCodeProcess -= API. This test launches a simple child process that exits -= with a known value, and checks that the correct value is -= returned by the function. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/CMakeLists.txt deleted file mode 100644 index 174958dc70f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt deleted file mode 100644 index 9bcd6b7fa18..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_getprocesstimes_test2 - ${SOURCES} -) - -add_dependencies(paltest_getprocesstimes_test2 coreclrpal) - -target_link_libraries(paltest_getprocesstimes_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp index 410f63793ad..7c1c7a10f65 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp @@ -20,7 +20,7 @@ #include <palsuite.h> -int __cdecl main( int argc, char **argv ) +PALTEST(threading_GetProcessTimes_test2_paltest_getprocesstimes_test2, "threading/GetProcessTimes/test2/paltest_getprocesstimes_test2") { int i, j, k; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/testinfo.dat deleted file mode 100644 index 71871ab36fa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetProcessTimes/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = GetProcessTimes -Name = Test for GetProcessTimes -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the GetProcessTimes() -= API. This test simply checks the kernel/user times for the -= the current process, which is the only thing supported -= for this function under the PAL. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt deleted file mode 100644 index 91581de4641..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_getthreadtimes_test1 - ${SOURCES} -) - -add_dependencies(paltest_getthreadtimes_test1 coreclrpal) - -target_link_libraries(paltest_getthreadtimes_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp index 3d91bfaecb4..255fab77642 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(threading_GetThreadTimes_test1_paltest_getthreadtimes_test1, "threading/GetThreadTimes/test1/paltest_getthreadtimes_test1") +{ int ret = FAIL; //Test is failing unreliably, so for now we always return pass. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt deleted file mode 100644 index 5199246aec0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SOURCES - namedmutex.cpp - nopal.cpp -) - -add_executable(paltest_namedmutex_test1 - ${SOURCES} -) - -add_dependencies(paltest_namedmutex_test1 coreclrpal) - -target_link_libraries(paltest_namedmutex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/namedmutex.cpp b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/namedmutex.cpp index 8fc33a199a7..7956a955455 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/namedmutex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/namedmutex.cpp @@ -197,6 +197,8 @@ bool StartProcess(const char *funcName) processCommandLinePathLength += test_strlen(g_processPath); g_processCommandLinePath[processCommandLinePathLength++] = '\"'; g_processCommandLinePath[processCommandLinePathLength++] = ' '; + processCommandLinePathLength += test_sprintf(&g_processCommandLinePath[processCommandLinePathLength], "%s ", "threading/NamedMutex/test1/paltest_namedmutex_test1"); + processCommandLinePathLength += test_sprintf(&g_processCommandLinePath[processCommandLinePathLength], "%u", g_parentPid); g_processCommandLinePath[processCommandLinePathLength++] = ' '; test_strcpy(&g_processCommandLinePath[processCommandLinePathLength], funcName); @@ -1188,7 +1190,7 @@ bool StressTests(DWORD durationMinutes) return static_cast<bool>(g_stressResult); } -int __cdecl main(int argc, char **argv) +PALTEST(threading_NamedMutex_test1_paltest_namedmutex_test1, "threading/NamedMutex/test1/paltest_namedmutex_test1") { if (argc < 1 || argc > 4) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/testinfo.dat deleted file mode 100644 index a1b6aab6a26..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = Named mutex -Name = Tests for named mutexes -TYPE = DEFAULT -EXE1 = namedmutex -Description -= These test cases test named mutexes, including positive -= and negative cases, cross-thread and cross-process, mutual -= exclusion, abandon detection, etc. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/CMakeLists.txt deleted file mode 100644 index dcf480bf226..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt deleted file mode 100644 index a33d65defdd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_openeventw_test1 - ${SOURCES} -) - -add_dependencies(paltest_openeventw_test1 coreclrpal) - -target_link_libraries(paltest_openeventw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp index b143faac7bf..3b119acaf8a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp @@ -14,7 +14,7 @@ **==========================================================================*/ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_OpenEventW_test1_paltest_openeventw_test1, "threading/OpenEventW/test1/paltest_openeventw_test1") { BOOL bRet = FAIL; DWORD dwRet; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/testinfo.dat deleted file mode 100644 index 12393a714da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenEventW -Name = Positive Test for OpenEventW -TYPE = DEFAULT -EXE1 = test1 -Description -= Purpose: Test for OpenEventW. This test creates an event, -= opens a handle to the same event, then waits on both handles -= in both a signalled and non-signalled state to verify they're -= pointing to the same event object. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt deleted file mode 100644 index 96fb22fc67c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_openeventw_test2 - ${SOURCES} -) - -add_dependencies(paltest_openeventw_test2 coreclrpal) - -target_link_libraries(paltest_openeventw_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp index 0edffc45725..4a2ac38e72d 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp @@ -28,7 +28,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenEventW_test2_paltest_openeventw_test2, "threading/OpenEventW/test2/paltest_openeventw_test2") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/testinfo.dat deleted file mode 100644 index 0e1fac09593..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test2/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenEventW -Name = Positive test for OpenEventW -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the OpenEventW() -= API by creating a new named event and verifying that -= it can be used interchangeably by setting the event -= with the original handle and waiting on it with the -= new one, then resetting it with the new one and waiting -= on it with the original one. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt deleted file mode 100644 index 4d95f7225cf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test3.cpp -) - -add_executable(paltest_openeventw_test3 - ${TESTSOURCES} -) - -add_dependencies(paltest_openeventw_test3 coreclrpal) - -target_link_libraries(paltest_openeventw_test3 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childprocess.cpp -) - -add_executable(paltest_openeventw_test3_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_openeventw_test3_child coreclrpal) - -target_link_libraries(paltest_openeventw_test3_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp index d2fab36c996..a868b7da4d6 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp @@ -26,7 +26,7 @@ #include <palsuite.h> -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenEventW_test3_paltest_openeventw_test3_child, "threading/OpenEventW/test3/paltest_openeventw_test3_child") { /* local variables */ HANDLE hEvent = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp index 702455b8007..58e21465f9a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp @@ -33,7 +33,7 @@ #define TIMEOUT 60000 -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenEventW_test3_paltest_openeventw_test3, "threading/OpenEventW/test3/paltest_openeventw_test3") { BOOL ret = FAIL; LPSECURITY_ATTRIBUTES lpEventAttributes = NULL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/testinfo.dat deleted file mode 100644 index d5ebeb05c9f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test3/testinfo.dat +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenEventW -Name = Test for OpenEventW -TYPE = DEFAULT -EXE1 = test3 -EXE2 = childprocess -Description -= Purpose: Test to ensure that OpenEventW() works when -= opening an event created by another process. This test -= program launches a child process which creates a -= named, initially-unset event. The child waits up to -= 10 seconds for the parent process to open that event -= and set it, and returns PASS if the event was set or FAIL -= otherwise. The parent process checks the return value -= from the child to verify that the opened event was -= properly used across processes. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt deleted file mode 100644 index 5c727e3f9b5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_openeventw_test4 - ${SOURCES} -) - -add_dependencies(paltest_openeventw_test4 coreclrpal) - -target_link_libraries(paltest_openeventw_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp index 9d062bd6d56..b56af149a4d 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp @@ -25,7 +25,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenEventW_test4_paltest_openeventw_test4, "threading/OpenEventW/test4/paltest_openeventw_test4") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/testinfo.dat deleted file mode 100644 index 31e512e7568..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenEventW -Name = Negative test for OpenEventW -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure proper operation of the OpenEventW() -= API by trying to open an event with a name that is -= already taken by a non-event object. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt deleted file mode 100644 index cd4b6116fde..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_openeventw_test5 - ${SOURCES} -) - -add_dependencies(paltest_openeventw_test5 coreclrpal) - -target_link_libraries(paltest_openeventw_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp index 0cde9c12d0e..6c692ba3b9b 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp @@ -30,7 +30,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenEventW_test5_paltest_openeventw_test5, "threading/OpenEventW/test5/paltest_openeventw_test5") { /* local variables */ @@ -188,7 +188,7 @@ cleanup: /* PAL termination */ - PAL_Terminate(); + PAL_TerminateEx(ret); /* return success or failure */ return ret; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/testinfo.dat deleted file mode 100644 index 548338f4372..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenEventW/test5/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenEventW -Name = Positive test for OpenEventW -TYPE = DEFAULT -EXE1 = test5 -Description -= Test to ensure proper operation of the OpenEventW() -= API by creating a new named event with CreateEventW() -= and verifying that it can be opened with OpenEventW(). -= It should be possible to use the event handles -= interchangeably, we test by setting the event with the -= original handle and waiting on it with the new one, -= then resetting it with the new one and waiting -= on it with the original one. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt deleted file mode 100644 index 2066846eef3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test1.cpp -) - -add_executable(paltest_openprocess_test1 - ${TESTSOURCES} -) - -add_dependencies(paltest_openprocess_test1 coreclrpal) - -target_link_libraries(paltest_openprocess_test1 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - childProcess.cpp -) - -add_executable(paltest_openprocess_test1_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_openprocess_test1_child coreclrpal) - -target_link_libraries(paltest_openprocess_test1_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp index a3dd3aa2a59..db78c20ebc7 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp @@ -21,7 +21,7 @@ #include "myexitcode.h" -int __cdecl main( int argc, char **argv ) +PALTEST(threading_OpenProcess_test1_paltest_openprocess_test1_child, "threading/OpenProcess/test1/paltest_openprocess_test1_child") { HANDLE hMutex; WCHAR wszMutexName[] = { 'T','E','S','T','1','\0' }; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp index 17c4a498efa..6a4b3cb9789 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp @@ -26,40 +26,7 @@ #include <palsuite.h> #include "myexitcode.h" - -static const char* rgchPathDelim = "\\"; - - -int -mkAbsoluteFilename( LPSTR dirName, - DWORD dwDirLength, - LPCSTR fileName, - DWORD dwFileLength, - LPSTR absPathName ) -{ - DWORD sizeDN, sizeFN, sizeAPN; - - sizeDN = strlen( dirName ); - sizeFN = strlen( fileName ); - sizeAPN = (sizeDN + 1 + sizeFN + 1); - - /* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */ - if( sizeAPN > _MAX_PATH ) - { - return ( 0 ); - } - - strncpy( absPathName, dirName, dwDirLength +1 ); - strncpy( absPathName, rgchPathDelim, 2 ); - strncpy( absPathName, fileName, dwFileLength +1 ); - - return (sizeAPN); - -} - - -int __cdecl main( int argc, char **argv ) - +PALTEST(threading_OpenProcess_test1_paltest_openprocess_test1, "threading/OpenProcess/test1/paltest_openprocess_test1") { const char* rgchChildFile = "childprocess"; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/testinfo.dat deleted file mode 100644 index 11a7c982653..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/OpenProcess/test1/testinfo.dat +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = OpenProcess -Name = Test for OpenProcess -TYPE = DEFAULT -EXE1 = test1 -EXE2 = childprocess -Description -= Test to ensure proper operation of the OpenProcess API. -= The test launches a trivial child process, then opens -= a handle to it using OpenProcess. It uses that handle -= to wait for the child process to terminate, and then -= checks the exit code of the child process in order to -= verify that it was in fact a handle to the correct -= process. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/CMakeLists.txt deleted file mode 100644 index e46df577575..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(test1) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt deleted file mode 100644 index df6b87667c5..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_querythreadcycletime_test1 - ${SOURCES} -) - -add_dependencies(paltest_querythreadcycletime_test1 coreclrpal) - -target_link_libraries(paltest_querythreadcycletime_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp index 0bb9d87a4ff..ff332fd0b3a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp @@ -14,7 +14,8 @@ #include <palsuite.h> -int __cdecl main(int argc, char *argv[]) { +PALTEST(threading_QueryThreadCycleTime_test1_paltest_querythreadcycletime_test1, "threading/QueryThreadCycleTime/test1/paltest_querythreadcycletime_test1") +{ int ret = FAIL; //Test is failing unreliably, so for now we always return pass. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/CMakeLists.txt deleted file mode 100644 index 7cd88f8e86d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt deleted file mode 100644 index c07fcfa04b8..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_queueuserapc_test1 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test1 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp index 886ba439a6c..8e5ff257d96 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp @@ -22,21 +22,21 @@ VOID PALAPI APCFuncA(ULONG_PTR dwParam); VOID PALAPI APCFuncB(ULONG_PTR dwParam); VOID PALAPI APCFuncC(ULONG_PTR dwParam); VOID PALAPI APCFuncD(ULONG_PTR dwParam); -DWORD PALAPI SleeperProc(LPVOID lpParameter); +DWORD PALAPI SleeperProc_QueueUserAPC_test1(LPVOID lpParameter); -const char *ExpectedResults = "A0B0C0D0A1B1C1D1A2B2C2D2A3B3C3D3"; -char ResultBuffer[256]; -char *ResultPtr; -DWORD ChildThread; +const char *ExpectedResults_QueueUserAPC_test1 = "A0B0C0D0A1B1C1D1A2B2C2D2A3B3C3D3"; +char ResultBuffer_QueueUserAPC_test1[256]; +char *ResultPtr_QueueUserAPC_test1; +DWORD ChildThread_QueueUserAPC_test1; /* synchronization events */ -static HANDLE hSyncEvent1 = NULL; -static HANDLE hSyncEvent2 = NULL; +static HANDLE hSyncEvent1_QueueUserAPC_test1 = NULL; +static HANDLE hSyncEvent2_QueueUserAPC_test1 = NULL; /* thread result because we have no GetExitCodeThread() API */ -BOOL bThreadResult = FAIL; +BOOL bThreadResult_QueueUserAPC_test1 = FAIL; -int __cdecl main (int argc, char **argv) +PALTEST(threading_QueueUserAPC_test1_paltest_queueuserapc_test1, "threading/QueueUserAPC/test1/paltest_queueuserapc_test1") { HANDLE hThread = NULL; int ret; @@ -57,18 +57,18 @@ int __cdecl main (int argc, char **argv) return FAIL; } - ResultPtr = ResultBuffer; + ResultPtr_QueueUserAPC_test1 = ResultBuffer_QueueUserAPC_test1; /* create a pair of synchronization events to coordinate our threads */ - hSyncEvent1 = CreateEvent( NULL, FALSE, FALSE, NULL ); - if( hSyncEvent1 == NULL ) + hSyncEvent1_QueueUserAPC_test1 = CreateEvent( NULL, FALSE, FALSE, NULL ); + if( hSyncEvent1_QueueUserAPC_test1 == NULL ) { Trace( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); goto cleanup; } - hSyncEvent2 = CreateEvent( NULL, FALSE, FALSE, NULL ); - if( hSyncEvent2 == NULL ) + hSyncEvent2_QueueUserAPC_test1 = CreateEvent( NULL, FALSE, FALSE, NULL ); + if( hSyncEvent2_QueueUserAPC_test1 == NULL ) { Trace( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); goto cleanup; @@ -77,10 +77,10 @@ int __cdecl main (int argc, char **argv) /* create a child thread which will call SleepEx */ hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)SleeperProc, + (LPTHREAD_START_ROUTINE)SleeperProc_QueueUserAPC_test1, 0, 0, - &ChildThread); + &ChildThread_QueueUserAPC_test1); if( hThread == NULL ) { @@ -91,7 +91,7 @@ int __cdecl main (int argc, char **argv) /* wait on our synchronization event to ensure the thread is running */ - ret = WaitForSingleObject( hSyncEvent1, 20000 ); + ret = WaitForSingleObject( hSyncEvent1_QueueUserAPC_test1, 20000 ); if( ret != WAIT_OBJECT_0 ) { Trace( "ERROR:WaitForSingleObject() returned %lu, " @@ -117,7 +117,7 @@ int __cdecl main (int argc, char **argv) } /* signal the child thread to continue */ - if( ! SetEvent( hSyncEvent2 ) ) + if( ! SetEvent( hSyncEvent2_QueueUserAPC_test1 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); goto cleanup; @@ -125,7 +125,7 @@ int __cdecl main (int argc, char **argv) /* wait on our synchronization event to ensure the other thread is done */ - ret = WaitForSingleObject( hSyncEvent1, 20000 ); + ret = WaitForSingleObject( hSyncEvent1_QueueUserAPC_test1, 20000 ); if( ret != WAIT_OBJECT_0 ) { Trace( "ERROR:WaitForSingleObject() returned %lu, " @@ -136,19 +136,19 @@ int __cdecl main (int argc, char **argv) /* check that the thread executed successfully */ - if( bThreadResult == FAIL ) + if( bThreadResult_QueueUserAPC_test1 == FAIL ) { goto cleanup; } /* check the result buffer */ - if (strcmp(ExpectedResults, ResultBuffer) != 0) + if (strcmp(ExpectedResults_QueueUserAPC_test1, ResultBuffer_QueueUserAPC_test1) != 0) { Trace( "FAIL:Expected the APC function calls to produce a result of " " \"%s\", got \"%s\"\n", - ExpectedResults, - ResultBuffer ); + ExpectedResults_QueueUserAPC_test1, + ResultBuffer_QueueUserAPC_test1 ); goto cleanup; } @@ -170,18 +170,18 @@ cleanup: } /* close our synchronization handles */ - if( hSyncEvent1 != NULL ) + if( hSyncEvent1_QueueUserAPC_test1 != NULL ) { - if( ! CloseHandle( hSyncEvent1 ) ) + if( ! CloseHandle( hSyncEvent1_QueueUserAPC_test1 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); bResult = FAIL; } } - if( hSyncEvent2 != NULL ) + if( hSyncEvent2_QueueUserAPC_test1 != NULL ) { - if( ! CloseHandle( hSyncEvent2 ) ) + if( ! CloseHandle( hSyncEvent2_QueueUserAPC_test1 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); bResult = FAIL; @@ -204,83 +204,83 @@ VOID PALAPI APCFuncA(ULONG_PTR dwParam) { char val = (int) dwParam; - if (GetCurrentThreadId() != ChildThread) + if (GetCurrentThreadId() != ChildThread_QueueUserAPC_test1) { Fail("Executing APC in thread %d, should be in %d!\n", - GetCurrentThreadId(), ChildThread); + GetCurrentThreadId(), ChildThread_QueueUserAPC_test1); } - *ResultPtr++ = 'A'; - *ResultPtr++ = val; - *ResultPtr = 0; + *ResultPtr_QueueUserAPC_test1++ = 'A'; + *ResultPtr_QueueUserAPC_test1++ = val; + *ResultPtr_QueueUserAPC_test1 = 0; } VOID PALAPI APCFuncB(ULONG_PTR dwParam) { char val = (int) dwParam; - if (GetCurrentThreadId() != ChildThread) + if (GetCurrentThreadId() != ChildThread_QueueUserAPC_test1) { Fail("Executing APC in thread %d, should be in %d!\n", - GetCurrentThreadId(), ChildThread); + GetCurrentThreadId(), ChildThread_QueueUserAPC_test1); } - *ResultPtr++ = 'B'; - *ResultPtr++ = val; - *ResultPtr = 0; + *ResultPtr_QueueUserAPC_test1++ = 'B'; + *ResultPtr_QueueUserAPC_test1++ = val; + *ResultPtr_QueueUserAPC_test1 = 0; } VOID PALAPI APCFuncC(ULONG_PTR dwParam) { char val = (int) dwParam; - if (GetCurrentThreadId() != ChildThread) + if (GetCurrentThreadId() != ChildThread_QueueUserAPC_test1) { Fail("Executing APC in thread %d, should be in %d!\n", - GetCurrentThreadId(), ChildThread); + GetCurrentThreadId(), ChildThread_QueueUserAPC_test1); } - *ResultPtr++ = 'C'; - *ResultPtr++ = val; - *ResultPtr = 0; + *ResultPtr_QueueUserAPC_test1++ = 'C'; + *ResultPtr_QueueUserAPC_test1++ = val; + *ResultPtr_QueueUserAPC_test1 = 0; } VOID PALAPI APCFuncD(ULONG_PTR dwParam) { char val = (int) dwParam; - if (GetCurrentThreadId() != ChildThread) + if (GetCurrentThreadId() != ChildThread_QueueUserAPC_test1) { Fail("Executing APC in thread %d, should be in %d!\n", - GetCurrentThreadId(), ChildThread); + GetCurrentThreadId(), ChildThread_QueueUserAPC_test1); } - *ResultPtr++ = 'D'; - *ResultPtr++ = val; - *ResultPtr = 0; + *ResultPtr_QueueUserAPC_test1++ = 'D'; + *ResultPtr_QueueUserAPC_test1++ = val; + *ResultPtr_QueueUserAPC_test1 = 0; } /* Entry Point for child thread. All it does is call SleepEx. */ -DWORD PALAPI SleeperProc(LPVOID lpParameter) +DWORD PALAPI SleeperProc_QueueUserAPC_test1(LPVOID lpParameter) { DWORD ret; /* signal the main thread that we're ready to proceed */ - if( ! SetEvent( hSyncEvent1 ) ) + if( ! SetEvent( hSyncEvent1_QueueUserAPC_test1 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); - bThreadResult = FAIL; + bThreadResult_QueueUserAPC_test1 = FAIL; goto done; } /* wait for notification from the main thread */ - ret = WaitForSingleObject( hSyncEvent2, 20000 ); + ret = WaitForSingleObject( hSyncEvent2_QueueUserAPC_test1, 20000 ); if( ret != WAIT_OBJECT_0 ) { Trace( "ERROR:WaitForSingleObject() returned %lu, " "expected WAIT_OBJECT_0\n", ret ); - bThreadResult = FAIL; + bThreadResult_QueueUserAPC_test1 = FAIL; goto done; } @@ -291,22 +291,22 @@ DWORD PALAPI SleeperProc(LPVOID lpParameter) Trace( "ERROR:SleepEx() call returned %lu, " "expected WAIT_IO_COMPLETION\n", ret ); - bThreadResult = FAIL; + bThreadResult_QueueUserAPC_test1 = FAIL; goto done; } /* everything passed here */ - bThreadResult = PASS; + bThreadResult_QueueUserAPC_test1 = PASS; done: /* signal the main thread that we're finished */ - if( ! SetEvent( hSyncEvent1 ) ) + if( ! SetEvent( hSyncEvent1_QueueUserAPC_test1 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); - bThreadResult = FAIL; + bThreadResult_QueueUserAPC_test1 = FAIL; } /* return success or failure */ - return bThreadResult; + return bThreadResult_QueueUserAPC_test1; } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/testinfo.dat deleted file mode 100644 index 812a128ac83..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Test #1 for QueueUserAPC -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that APCs sent to a thread in an alertable state via -=QueueUserAPC are executed in FIFO order. Also tests that the APC -=function is executed within the context of the correct thread and -=that the dwData parameter gets sent correctly. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt deleted file mode 100644 index 7247214b55f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_queueuserapc_test2 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test2 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp index b7ec387647c..cc362393e9c 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp @@ -27,12 +27,12 @@ static HANDLE hSyncEvent2 = NULL; static BOOL bThreadResult = FAIL; -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_QueueUserAPC_test2(ULONG_PTR dwParam) { InAPC = TRUE; } -DWORD PALAPI SleeperProc(LPVOID lpParameter) +DWORD PALAPI SleeperProc_QueueUserAPC_test2(LPVOID lpParameter) { DWORD ret; @@ -76,7 +76,7 @@ done: } -int __cdecl main (int argc, char **argv) +PALTEST(threading_QueueUserAPC_test2_paltest_queueuserapc_test2, "threading/QueueUserAPC/test2/paltest_queueuserapc_test2") { /* local variables */ HANDLE hThread = 0; @@ -109,7 +109,7 @@ int __cdecl main (int argc, char **argv) /* create a child thread */ hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)SleeperProc, + (LPTHREAD_START_ROUTINE)SleeperProc_QueueUserAPC_test2, 0, 0, &ChildThread); @@ -133,7 +133,7 @@ int __cdecl main (int argc, char **argv) } /* queue a user APC on the child thread */ - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_QueueUserAPC_test2, hThread, 0); if (ret == 0) { Trace( "ERROR:%lu:QueueUserAPC() call failed\n", diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/testinfo.dat deleted file mode 100644 index c915a5415bc..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Test #2 for QueueUserAPC -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that APCs are not executed if a thread never enters an -=alertable state after they are queued. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt deleted file mode 100644 index 0cacac7a733..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_queueuserapc_test3 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test3 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp index a5f694bb41e..d1265191b55 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp @@ -12,7 +12,7 @@ #include <palsuite.h> -int __cdecl main (int argc, char **argv) +PALTEST(threading_QueueUserAPC_test3_paltest_queueuserapc_test3, "threading/QueueUserAPC/test3/paltest_queueuserapc_test3") { int ret; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/testinfo.dat deleted file mode 100644 index 4dd3fc6b098..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test3/testinfo.dat +++ /dev/null @@ -1,11 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Test #3 for QueueUserAPC -TYPE = DEFAULT -EXE1 = test3 -Description -=Tests how QueueUserAPC handles an invalid thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt deleted file mode 100644 index a46730424da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_queueuserapc_test4 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test4 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp index 4b54513d5ed..5a4add3a811 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp @@ -21,14 +21,14 @@ #include <palsuite.h> -static BOOL bAPCExecuted = FALSE; +static BOOL bAPCExecuted_QueueUserAPC_test4 = FALSE; -VOID PALAPI APCFunc( ULONG_PTR dwParam ) +VOID PALAPI APCFunc_QueueUserAPC_test4( ULONG_PTR dwParam ) { - bAPCExecuted = TRUE; + bAPCExecuted_QueueUserAPC_test4 = TRUE; } -int __cdecl main( int argc, char **argv ) +PALTEST(threading_QueueUserAPC_test4_paltest_queueuserapc_test4, "threading/QueueUserAPC/test4/paltest_queueuserapc_test4") { /* local variables */ @@ -43,7 +43,7 @@ int __cdecl main( int argc, char **argv ) /* get the current thread */ hThread = GetCurrentThread(); - ret = QueueUserAPC( APCFunc, hThread, 0 ); + ret = QueueUserAPC( APCFunc_QueueUserAPC_test4, hThread, 0 ); if( ret == 0 ) { Fail( "ERROR:%lu:QueueUserAPC call failed\n", GetLastError() ); @@ -58,7 +58,7 @@ int __cdecl main( int argc, char **argv ) } /* check that the APC function was executed */ - if( bAPCExecuted == FALSE ) + if( bAPCExecuted_QueueUserAPC_test4 == FALSE ) { Fail( "ERROR:APC function was not executed\n" ); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/testinfo.dat deleted file mode 100644 index 7813384a4ae..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Positive test for QueueUserAPC -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure proper operation of the QueueUserAPC() -= API by trying to queue APC functions on the current -= thread. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt deleted file mode 100644 index 0756fbd4a8e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test5.cpp -) - -add_executable(paltest_queueuserapc_test5 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test5 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test5 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp index 6095ffcbcce..f31773947eb 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp @@ -31,12 +31,12 @@ #include <palsuite.h> -static HANDLE hEvent = NULL; -static BOOL bAPCExecuted = FALSE; +static HANDLE hEvent_QueueUserAPC_test5 = NULL; +static BOOL bAPCExecuted_QueueUserAPC_test5 = FALSE; -VOID PALAPI APCFunc( ULONG_PTR dwParam ) +VOID PALAPI APCFunc_QueueUserAPC_test5( ULONG_PTR dwParam ) { - bAPCExecuted = TRUE; + bAPCExecuted_QueueUserAPC_test5 = TRUE; } /** @@ -44,12 +44,12 @@ VOID PALAPI APCFunc( ULONG_PTR dwParam ) * * Dummy thread function for APC queuing. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_QueueUserAPC_test5( LPVOID param ) { DWORD ret = 0; /* alertable wait until the global event is signalled */ - ret = WaitForSingleObject( hEvent, INFINITE ); + ret = WaitForSingleObject( hEvent_QueueUserAPC_test5, INFINITE ); if( ret != WAIT_OBJECT_0 ) { Fail( "ERROR:WaitForSingleObject() returned %lu, " @@ -61,7 +61,7 @@ DWORD PALAPI ThreadFunc( LPVOID param ) } -int __cdecl main( int argc, char **argv ) +PALTEST(threading_QueueUserAPC_test5_paltest_queueuserapc_test5, "threading/QueueUserAPC/test5/paltest_queueuserapc_test5") { /* local variables */ @@ -77,8 +77,8 @@ int __cdecl main( int argc, char **argv ) } /* create an event for the other thread to wait on */ - hEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); - if( hEvent == NULL ) + hEvent_QueueUserAPC_test5 = CreateEvent( NULL, TRUE, FALSE, NULL ); + if( hEvent_QueueUserAPC_test5 == NULL ) { Fail( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); } @@ -86,7 +86,7 @@ int __cdecl main( int argc, char **argv ) /* run another dummy thread to cause notification of the library */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_QueueUserAPC_test5, /* thread function */ (LPVOID) NULL, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ @@ -97,7 +97,7 @@ int __cdecl main( int argc, char **argv ) { /* error creating thread */ Trace( "ERROR:%lu:CreateThread call failed\n", GetLastError() ); - if( ! CloseHandle( hEvent ) ) + if( ! CloseHandle( hEvent_QueueUserAPC_test5 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); } @@ -105,7 +105,7 @@ int __cdecl main( int argc, char **argv ) } /* queue our APC on the suspended thread */ - ret = QueueUserAPC( APCFunc, hThread, 0 ); + ret = QueueUserAPC( APCFunc_QueueUserAPC_test5, hThread, 0 ); if( ret == 0 ) { Fail( "ERROR:%lu:QueueUserAPC call failed\n", GetLastError() ); @@ -122,7 +122,7 @@ int __cdecl main( int argc, char **argv ) } /* verify that the APC function was not executed */ - if( bAPCExecuted == TRUE ) + if( bAPCExecuted_QueueUserAPC_test5 == TRUE ) { Trace( "ERROR:APC function was executed for a suspended thread\n" ); goto cleanup; @@ -144,7 +144,7 @@ int __cdecl main( int argc, char **argv ) } /* check that the APC function was actually executed */ - if( bAPCExecuted == FALSE ) + if( bAPCExecuted_QueueUserAPC_test5 == FALSE ) { Trace( "ERROR:APC function was not executed\n" ); goto cleanup; @@ -155,14 +155,14 @@ int __cdecl main( int argc, char **argv ) cleanup: /* signal the event so the other thread will exit */ - if( ! SetEvent( hEvent ) ) + if( ! SetEvent( hEvent_QueueUserAPC_test5 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); bResult = FAIL; } /* close the global event handle */ - if( ! CloseHandle( hEvent ) ) + if( ! CloseHandle( hEvent_QueueUserAPC_test5 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); bResult = FAIL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/testinfo.dat deleted file mode 100644 index 8fe1d93b7b9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test5/testinfo.dat +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Positive test for QueueUserAPC -TYPE = DEFAULT -EXE1 = test5 -Description -= Test to ensure proper operation of the QueueUserAPC() -= API by trying to queue and activate APC functions on -= a thread that was created suspended, prior to resuming -= it. We're verifying the following behavior: -= -= "If an application queues an APC before the thread begins -= running, the thread begins by calling the APC function. -= After the thread calls an APC function, it calls the APC -= functions for all APCs in its APC queue." diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt deleted file mode 100644 index d6c7a27db5e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test6.cpp -) - -add_executable(paltest_queueuserapc_test6 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test6 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test6 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp index 2cf30224f4d..1bcbfbfb0a4 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp @@ -25,11 +25,11 @@ #include <palsuite.h> -static BOOL bAPCExecuted = FALSE; +static BOOL bAPCExecuted_QueueUserAPC_test6 = FALSE; -VOID PALAPI APCFunc( ULONG_PTR dwParam ) +VOID PALAPI APCFunc_QueueUserAPC_test6( ULONG_PTR dwParam ) { - bAPCExecuted = TRUE; + bAPCExecuted_QueueUserAPC_test6 = TRUE; } /** @@ -37,7 +37,7 @@ VOID PALAPI APCFunc( ULONG_PTR dwParam ) * * Dummy thread function for APC queuing. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_QueueUserAPC_test6( LPVOID param ) { int i; @@ -49,7 +49,7 @@ DWORD PALAPI ThreadFunc( LPVOID param ) } -int __cdecl main( int argc, char **argv ) +PALTEST(threading_QueueUserAPC_test6_paltest_queueuserapc_test6, "threading/QueueUserAPC/test6/paltest_queueuserapc_test6") { /* local variables */ @@ -66,7 +66,7 @@ int __cdecl main( int argc, char **argv ) /* run another dummy thread to cause notification of the library */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_QueueUserAPC_test6, /* thread function */ (LPVOID) NULL, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ @@ -97,7 +97,7 @@ int __cdecl main( int argc, char **argv ) } /* queue our APC on the finished thread */ - ret = QueueUserAPC( APCFunc, hThread, 0 ); + ret = QueueUserAPC( APCFunc_QueueUserAPC_test6, hThread, 0 ); if( ret != 0 ) { Trace( "ERROR:QueueUserAPC call succeeded on a terminated thread\n" ); @@ -114,7 +114,7 @@ int __cdecl main( int argc, char **argv ) } /* dummy check that the APC function wasn't actually executed */ - if( bAPCExecuted != FALSE ) + if( bAPCExecuted_QueueUserAPC_test6 != FALSE ) { Fail( "ERROR:APC function was executed\n" ); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/testinfo.dat deleted file mode 100644 index 402fa57c44f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test6/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Negative test for QueueUserAPC -TYPE = DEFAULT -EXE1 = test6 -Description -= Test to ensure proper operation of the QueueUserAPC() -= API by trying to queue APC functions on a thread that -= has already terminated. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt deleted file mode 100644 index 4bfc4d6ebf9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test7.cpp -) - -add_executable(paltest_queueuserapc_test7 - ${SOURCES} -) - -add_dependencies(paltest_queueuserapc_test7 coreclrpal) - -target_link_libraries(paltest_queueuserapc_test7 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp index cef42923364..555b4955ed3 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp @@ -25,14 +25,14 @@ #include <palsuite.h> -static HANDLE hSyncEvent = NULL; -static HANDLE hTestEvent = NULL; -static int nAPCExecuted = 0; -static BOOL bThreadResult = FALSE; +static HANDLE hSyncEvent_QueueUserAPC_test7 = NULL; +static HANDLE hTestEvent_QueueUserAPC_test7 = NULL; +static int nAPCExecuted_QueueUserAPC_test7 = 0; +static BOOL bThreadResult_QueueUserAPC_test7 = FALSE; -VOID PALAPI APCFunc( ULONG_PTR dwParam ) +VOID PALAPI APCFunc_QueueUserAPC_test7( ULONG_PTR dwParam ) { - ++nAPCExecuted; + ++nAPCExecuted_QueueUserAPC_test7; } /** @@ -40,22 +40,22 @@ VOID PALAPI APCFunc( ULONG_PTR dwParam ) * * Dummy thread function for APC queuing. */ -DWORD PALAPI ThreadFunc( LPVOID param ) +DWORD PALAPI ThreadFunc_QueueUserAPC_test7( LPVOID param ) { DWORD ret = 0; /* pessimism */ - bThreadResult = FALSE; + bThreadResult_QueueUserAPC_test7 = FALSE; /* set the sync event to notify the main thread */ - if( ! SetEvent( hSyncEvent ) ) + if( ! SetEvent( hSyncEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); goto done; } /* wait until the test event is signalled */ - ret = WaitForSingleObject( hTestEvent, INFINITE ); + ret = WaitForSingleObject( hTestEvent_QueueUserAPC_test7, INFINITE ); if( ret != WAIT_OBJECT_0 ) { Trace( "ERROR:WaitForSingleObject() returned %lu, " @@ -66,7 +66,7 @@ DWORD PALAPI ThreadFunc( LPVOID param ) /* now do an alertable wait on the same event, which is now in an unsignalled state */ - ret = WaitForMultipleObjectsEx( 1, &hTestEvent, TRUE, 2000, TRUE ); + ret = WaitForMultipleObjectsEx( 1, &hTestEvent_QueueUserAPC_test7, TRUE, 2000, TRUE ); /* verify that we got a WAIT_IO_COMPLETION result */ if( ret != WAIT_IO_COMPLETION ) @@ -78,14 +78,14 @@ DWORD PALAPI ThreadFunc( LPVOID param ) } /* set the event again */ - if( ! SetEvent( hTestEvent ) ) + if( ! SetEvent( hTestEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); goto done; } /* do a non-alertable wait on the same event */ - ret = WaitForMultipleObjectsEx( 1, &hTestEvent, TRUE, INFINITE, FALSE ); + ret = WaitForMultipleObjectsEx( 1, &hTestEvent_QueueUserAPC_test7, TRUE, INFINITE, FALSE ); /* verify that we got a WAIT_OBJECT_0 result */ if( ret != WAIT_OBJECT_0 ) @@ -97,15 +97,15 @@ DWORD PALAPI ThreadFunc( LPVOID param ) } /* success at this point */ - bThreadResult = TRUE; + bThreadResult_QueueUserAPC_test7 = TRUE; done: - return bThreadResult; + return bThreadResult_QueueUserAPC_test7; } -int __cdecl main( int argc, char **argv ) +PALTEST(threading_QueueUserAPC_test7_paltest_queueuserapc_test7, "threading/QueueUserAPC/test7/paltest_queueuserapc_test7") { /* local variables */ @@ -121,18 +121,18 @@ int __cdecl main( int argc, char **argv ) } /* create an auto-reset event for the other thread to wait on */ - hTestEvent = CreateEvent( NULL, FALSE, FALSE, NULL ); - if( hTestEvent == NULL ) + hTestEvent_QueueUserAPC_test7 = CreateEvent( NULL, FALSE, FALSE, NULL ); + if( hTestEvent_QueueUserAPC_test7 == NULL ) { Fail( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); } /* create an auto-reset event for synchronization */ - hSyncEvent = CreateEvent( NULL, FALSE, FALSE, NULL ); - if( hSyncEvent == NULL ) + hSyncEvent_QueueUserAPC_test7 = CreateEvent( NULL, FALSE, FALSE, NULL ); + if( hSyncEvent_QueueUserAPC_test7 == NULL ) { Trace( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); - if( ! CloseHandle( hTestEvent ) ) + if( ! CloseHandle( hTestEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:CreateEvent() call failed\n", GetLastError() ); } @@ -142,7 +142,7 @@ int __cdecl main( int argc, char **argv ) /* run another dummy thread to cause notification of the library */ hThread = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE) ThreadFunc, /* thread function */ + (LPTHREAD_START_ROUTINE) ThreadFunc_QueueUserAPC_test7, /* thread function */ (LPVOID) NULL, /* pass thread index as */ /* function argument */ CREATE_SUSPENDED, /* create suspended */ @@ -153,7 +153,7 @@ int __cdecl main( int argc, char **argv ) { /* error creating thread */ Trace( "ERROR:%lu:CreateThread call failed\n", GetLastError() ); - if( ! CloseHandle( hTestEvent ) ) + if( ! CloseHandle( hTestEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); } @@ -164,7 +164,7 @@ int __cdecl main( int argc, char **argv ) ResumeThread( hThread ); /* wait until the other thread is ready to proceed */ - ret = WaitForSingleObject( hSyncEvent, 10000 ); + ret = WaitForSingleObject( hSyncEvent_QueueUserAPC_test7, 10000 ); if( ret != WAIT_OBJECT_0 ) { Trace( "ERROR:WaitForSingleObject returned %lu, " @@ -175,7 +175,7 @@ int __cdecl main( int argc, char **argv ) /* now queue our APC on the test thread */ - ret = QueueUserAPC( APCFunc, hThread, 0 ); + ret = QueueUserAPC( APCFunc_QueueUserAPC_test7, hThread, 0 ); if( ret == 0 ) { Trace( "ERROR:%lu:QueueUserAPC call failed\n", GetLastError() ); @@ -183,7 +183,7 @@ int __cdecl main( int argc, char **argv ) } /* signal the test event so the other thread will proceed */ - if( ! SetEvent( hTestEvent ) ) + if( ! SetEvent( hTestEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:SetEvent() call failed\n", GetLastError() ); goto cleanup; @@ -200,16 +200,16 @@ int __cdecl main( int argc, char **argv ) } /* check the result of the other thread */ - if( bThreadResult == FALSE ) + if( bThreadResult_QueueUserAPC_test7 == FALSE ) { goto cleanup; } /* check that the APC function was actually executed exactly one time */ - if( nAPCExecuted != 1 ) + if( nAPCExecuted_QueueUserAPC_test7 != 1 ) { Trace( "ERROR:APC function was executed %d times, " - "expected once\n", nAPCExecuted ); + "expected once\n", nAPCExecuted_QueueUserAPC_test7 ); goto cleanup; } @@ -219,13 +219,13 @@ int __cdecl main( int argc, char **argv ) cleanup: /* close the global event handles */ - if( ! CloseHandle( hTestEvent ) ) + if( ! CloseHandle( hTestEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); bResult = FAIL; } - if( ! CloseHandle( hSyncEvent ) ) + if( ! CloseHandle( hSyncEvent_QueueUserAPC_test7 ) ) { Trace( "ERROR:%lu:CloseHandle() call failed\n", GetLastError() ); bResult = FAIL; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/testinfo.dat deleted file mode 100644 index 23b4288e0ea..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/QueueUserAPC/test7/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = QueueUserAPC -Name = Positive test for QueueUserAPC -TYPE = DEFAULT -EXE1 = test7 -Description -= Test to ensure proper operation of the QueueUserAPC() -= API by trying to queue an APC function on a thread and -= activating it with WaitForMultipleObjectsEx. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/CMakeLists.txt deleted file mode 100644 index a267d29f556..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test3) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt deleted file mode 100644 index 4c626bf14ff..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ReleaseMutex.cpp -) - -add_executable(paltest_releasemutex_test3 - ${SOURCES} -) - -add_dependencies(paltest_releasemutex_test3 coreclrpal) - -target_link_libraries(paltest_releasemutex_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp index 26fe09687d0..be43bce844e 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp @@ -17,28 +17,28 @@ #include <palsuite.h> -DWORD dwTestResult; /* global for test result */ +DWORD dwTestResult_ReleaseMutex_test3; /* global for test result */ -DWORD dwThreadId; /* consumer thread identifier */ +DWORD dwThreadId_ReleaseMutex_test3; /* consumer thread identifier */ -HANDLE hMutex; /* handle to mutex */ +HANDLE hMutex_ReleaseMutex_test3; /* handle to mutex */ -HANDLE hThread; /* handle to thread */ +HANDLE hThread_ReleaseMutex_test3; /* handle to thread */ /* * Thread function. */ DWORD PALAPI -ThreadFunction( LPVOID lpNoArg ) +ThreadFunction_ReleaseMutex_test3( LPVOID lpNoArg ) { - dwTestResult = ReleaseMutex(hMutex); + dwTestResult_ReleaseMutex_test3 = ReleaseMutex(hMutex_ReleaseMutex_test3); return 0; } -int __cdecl main (int argc, char **argv) +PALTEST(threading_ReleaseMutex_test3_paltest_releasemutex_test3, "threading/ReleaseMutex/test3/paltest_releasemutex_test3") { if(0 != (PAL_Initialize(argc, argv))) @@ -49,17 +49,17 @@ int __cdecl main (int argc, char **argv) /* * set dwTestResult so test fails even if ReleaseMutex is not called */ - dwTestResult = 1; + dwTestResult_ReleaseMutex_test3 = 1; /* * Create mutex */ - hMutex = CreateMutexW ( + hMutex_ReleaseMutex_test3 = CreateMutexW ( NULL, TRUE, NULL); - if ( NULL == hMutex ) + if ( NULL == hMutex_ReleaseMutex_test3 ) { Fail ( "hMutex = CreateMutex () - returned NULL\n" "Failing Test.\nGetLastError returned %d\n", GetLastError()); @@ -68,15 +68,15 @@ int __cdecl main (int argc, char **argv) /* * Create ThreadFunction */ - hThread = CreateThread( + hThread_ReleaseMutex_test3 = CreateThread( NULL, 0, - ThreadFunction, + ThreadFunction_ReleaseMutex_test3, NULL, 0, - &dwThreadId); + &dwThreadId_ReleaseMutex_test3); - if ( NULL == hThread ) + if ( NULL == hThread_ReleaseMutex_test3 ) { Fail ( "CreateThread() returned NULL. Failing test.\n" @@ -86,12 +86,12 @@ int __cdecl main (int argc, char **argv) /* * Wait for ThreadFunction to complete */ - WaitForSingleObject (hThread, INFINITE); + WaitForSingleObject (hThread_ReleaseMutex_test3, INFINITE); - if (dwTestResult) + if (dwTestResult_ReleaseMutex_test3) { Fail ("ReleaseMutex() test was expected to return 0.\n" - "It returned %d. Failing test.\n", dwTestResult ); + "It returned %d. Failing test.\n", dwTestResult_ReleaseMutex_test3 ); } Trace ("ReleaseMutex() test returned 0.\nTest passed.\n"); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/testinfo.dat deleted file mode 100644 index b88a8fa5ce2..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ReleaseMutex/test3/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ReleaseMutex -Name = Positive Test for ReleaseMutex -TYPE = DEFAULT -EXE1 = releasemutex -Description -= Calls ReleaseMutex from a thread which should not have ownership of the -= mutex. If ReleaseMutex fails correctly this test will succeed. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt deleted file mode 100644 index 85026ccc717..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_resetevent_test1 - ${SOURCES} -) - -add_dependencies(paltest_resetevent_test1 coreclrpal) - -target_link_libraries(paltest_resetevent_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp index b2fef7b1928..80ce8b64a39 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp @@ -79,7 +79,7 @@ BOOL ResetEventTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_ResetEvent_test1_paltest_resetevent_test1, "threading/ResetEvent/test1/paltest_resetevent_test1") { if(0 != (PAL_Initialize(argc, argv))) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/testinfo.dat deleted file mode 100644 index c3caf1f4dd3..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ResetEvent -Name = Positive Test for ResetEvent -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for ResetEvent. Create an event with an intial -= state signaled. Then reset that signal, and check to see that -= the event is now not signaled. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt deleted file mode 100644 index 11a1fbf26a7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_resetevent_test2 - ${SOURCES} -) - -add_dependencies(paltest_resetevent_test2 coreclrpal) - -target_link_libraries(paltest_resetevent_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp index 1f23d79bb6c..2e04bec0009 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp @@ -22,7 +22,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ResetEvent_test2_paltest_resetevent_test2, "threading/ResetEvent/test2/paltest_resetevent_test2") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/testinfo.dat deleted file mode 100644 index 91d105e294d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ResetEvent -Name = Positive test for ResetEvent -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the ResetEvent() -= API by calling it on an event handle that's already -= unsignalled. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt deleted file mode 100644 index db50041da87..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_resetevent_test3 - ${SOURCES} -) - -add_dependencies(paltest_resetevent_test3 coreclrpal) - -target_link_libraries(paltest_resetevent_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp index 601b6b4e353..f0c64499bd7 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp @@ -25,7 +25,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ResetEvent_test3_paltest_resetevent_test3, "threading/ResetEvent/test3/paltest_resetevent_test3") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/testinfo.dat deleted file mode 100644 index 652085c2262..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ResetEvent -Name = Negative test for ResetEvent -TYPE = DEFAULT -EXE1 = test3 -Description -= Test to ensure proper operation of the ResetEvent() -= API by calling it on an event handle that's been -= closed. We expect it to return an appropriate error -= result. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt deleted file mode 100644 index 4a82944dea6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_resetevent_test4 - ${SOURCES} -) - -add_dependencies(paltest_resetevent_test4 coreclrpal) - -target_link_libraries(paltest_resetevent_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp index 0efe87f3228..cf89cd551a7 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp @@ -27,7 +27,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_ResetEvent_test4_paltest_resetevent_test4, "threading/ResetEvent/test4/paltest_resetevent_test4") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/testinfo.dat deleted file mode 100644 index 9ae938ef284..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResetEvent/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ResetEvent -Name = Positive test for ResetEvent -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure proper operation of the ResetEvent() -= API by calling it on an event handle that's the -= result of a DuplicateHandle() call on another event -= handle. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt deleted file mode 100644 index 7f2046fb060..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_resumethread_test1 - ${SOURCES} -) - -add_dependencies(paltest_resumethread_test1 coreclrpal) - -target_link_libraries(paltest_resumethread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp index 952b8c614a5..565cc527c4f 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp @@ -121,7 +121,7 @@ BOOL ResumeThreadTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_ResumeThread_test1_paltest_resumethread_test1, "threading/ResumeThread/test1/paltest_resumethread_test1") { if(0 != (PAL_Initialize(argc, argv))) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/testinfo.dat deleted file mode 100644 index a0e64fb5bdb..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ResumeThread/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ResumeThread -Name = Positive Test for ResumeThread -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for ResumeThread. Create a suspended Thread. -= First, ensure that it is indeed suspended. Then call resumethread -= and check to ensure that the function has now run. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt deleted file mode 100644 index 8696f23d009..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_seterrormode_test1 - ${SOURCES} -) - -add_dependencies(paltest_seterrormode_test1 coreclrpal) - -target_link_libraries(paltest_seterrormode_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp index ad4d278cbcd..6774312fb5d 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp @@ -14,7 +14,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_SetErrorMode_test1_paltest_seterrormode_test1, "threading/SetErrorMode/test1/paltest_seterrormode_test1") { DWORD dErrorReturn; UINT dErrorModes[] = {SEM_NOOPENFILEERRORBOX, SEM_FAILCRITICALERRORS, 0}; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/testinfo.dat deleted file mode 100644 index b3e71e9f078..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetErrorMode/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = Threading -Function = SetErrorMode -Name = Positive Test for SetErrorMode -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the SetErrorMode function. -= This test will set the error mode and then read the error -= set with GetLastError(). - - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/CMakeLists.txt deleted file mode 100644 index 070e4218368..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt deleted file mode 100644 index df55cadc70e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_setevent_test1 - ${SOURCES} -) - -add_dependencies(paltest_setevent_test1 coreclrpal) - -target_link_libraries(paltest_setevent_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp index b5bfe85a0ed..b374e713644 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp @@ -75,7 +75,7 @@ BOOL SetEventTest() } -int __cdecl main(int argc, char **argv) +PALTEST(threading_SetEvent_test1_paltest_setevent_test1, "threading/SetEvent/test1/paltest_setevent_test1") { if(0 != (PAL_Initialize(argc, argv))) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/testinfo.dat deleted file mode 100644 index b44ad50a507..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SetEvent -Name = Positive Test for SetEvent -TYPE = DEFAULT -EXE1 = test1 -Description -=Test for SetEvent. Create an Event and then set -=this event, checking the return value. Ensure that it returns -=positive. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt deleted file mode 100644 index d8bf0b957cf..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_setevent_test2 - ${SOURCES} -) - -add_dependencies(paltest_setevent_test2 coreclrpal) - -target_link_libraries(paltest_setevent_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp index 275ed146c0c..373d0f7a53f 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp @@ -23,7 +23,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_SetEvent_test2_paltest_setevent_test2, "threading/SetEvent/test2/paltest_setevent_test2") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/testinfo.dat deleted file mode 100644 index 6a1f6b93d51..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SetEvent -Name = Positive test for SetEvent -TYPE = DEFAULT -EXE1 = test2 -Description -= Test to ensure proper operation of the SetEvent() -= API by calling it on an event handle that's already set. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt deleted file mode 100644 index bc9bd267ab4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_setevent_test3 - ${SOURCES} -) - -add_dependencies(paltest_setevent_test3 coreclrpal) - -target_link_libraries(paltest_setevent_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp index a4c032d5cec..057661d4580 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp @@ -24,7 +24,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_SetEvent_test3_paltest_setevent_test3, "threading/SetEvent/test3/paltest_setevent_test3") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/testinfo.dat deleted file mode 100644 index b9842b2ed31..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SetEvent -Name = Negative test for SetEvent -TYPE = DEFAULT -EXE1 = test3 -Description -= Test to ensure proper operation of the SetEvent() -= API by calling it on an event handle that's been -= closed. We expect it to return an appropriate error -= result. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt deleted file mode 100644 index 129c11a9e40..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_setevent_test4 - ${SOURCES} -) - -add_dependencies(paltest_setevent_test4 coreclrpal) - -target_link_libraries(paltest_setevent_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp index 1433c2306d4..8a86ecf9bad 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp @@ -27,7 +27,7 @@ -int __cdecl main( int argc, char **argv ) +PALTEST(threading_SetEvent_test4_paltest_setevent_test4, "threading/SetEvent/test4/paltest_setevent_test4") { /* local variables */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/testinfo.dat deleted file mode 100644 index 9f77ba4e74c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SetEvent/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SetEvent -Name = Positive test for SetEvent -TYPE = DEFAULT -EXE1 = test4 -Description -= Test to ensure proper operation of the SetEvent() -= API by calling it on an event handle that's the -= result of a DuplicateHandle() call on another event -= handle. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/CMakeLists.txt deleted file mode 100644 index cc05747facd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - SignalObjectAndWaitTest.cpp -) - -add_executable(paltest_signalobjectandwaittest - ${SOURCES} -) - -add_dependencies(paltest_signalobjectandwaittest coreclrpal) - -target_link_libraries(paltest_signalobjectandwaittest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/SignalObjectAndWaitTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/SignalObjectAndWaitTest.cpp index 1a4aa340d26..5bdccd4dbd4 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/SignalObjectAndWaitTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SignalObjectAndWait/SignalObjectAndWaitTest.cpp @@ -382,7 +382,7 @@ void Run() } } -int _cdecl main(int argc, char **argv) +PALTEST(threading_SignalObjectAndWait_paltest_signalobjectandwaittest, "threading/SignalObjectAndWait/paltest_signalobjectandwaittest") { if (PAL_Initialize(argc, argv) != 0) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt deleted file mode 100644 index 47b2a2dbec7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - Sleep.cpp -) - -add_executable(paltest_sleep_test1 - ${SOURCES} -) - -add_dependencies(paltest_sleep_test1 coreclrpal) - -target_link_libraries(paltest_sleep_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp index d08e6da20d9..3cc3d924482 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp @@ -18,20 +18,20 @@ #include <palsuite.h> -DWORD SleepTimes[] = +PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltest_sleep_test1") { - 0, - 50, - 100, - 500, - 2000 -}; + DWORD SleepTimes[] = + { + 0, + 50, + 100, + 500, + 2000 + }; -/* Milliseconds of error which are acceptable Function execution time, etc. */ -DWORD AcceptableTimeError = 150; + /* Milliseconds of error which are acceptable Function execution time, etc. */ + DWORD AcceptableTimeError = 150; -int __cdecl main( int argc, char **argv ) -{ UINT64 OldTimeStamp; UINT64 NewTimeStamp; DWORD MaxDelta; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/testinfo.dat deleted file mode 100644 index b0355f830f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = Sleep -Name = Positive Test for Sleep -TYPE = DEFAULT -EXE1 = sleep -Description -= Test to see if the Sleep function stops the thread from executing for the -= specified amount of time. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt deleted file mode 100644 index 770404fce0d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - sleep.cpp -) - -add_executable(paltest_sleep_test2 - ${SOURCES} -) - -add_dependencies(paltest_sleep_test2 coreclrpal) - -target_link_libraries(paltest_sleep_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp index 1393ce3170b..a4e1b465af2 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp @@ -16,23 +16,23 @@ #include <palsuite.h> -/* - * times in 10^(-3) seconds - */ - -DWORD SleepTimes[] = +PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltest_sleep_test2") { - 60000, - 300000, - 1800000, - 3200000 -}; + /* + * times in 10^(-3) seconds + */ + + DWORD SleepTimes[] = + { + 60000, + 300000, + 1800000, + 3200000 + }; -/* Milliseconds of error which are acceptable Function execution time, etc. */ -DWORD AcceptableTimeError = 150; + /* Milliseconds of error which are acceptable Function execution time, etc. */ + DWORD AcceptableTimeError = 150; -int __cdecl main( int argc, char **argv ) -{ UINT64 OldTimeStamp; UINT64 NewTimeStamp; DWORD MaxDelta; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/testinfo.dat deleted file mode 100644 index b0355f830f0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/Sleep/test2/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = Sleep -Name = Positive Test for Sleep -TYPE = DEFAULT -EXE1 = sleep -Description -= Test to see if the Sleep function stops the thread from executing for the -= specified amount of time. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/CMakeLists.txt deleted file mode 100644 index 65453539668..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt deleted file mode 100644 index 492fa180c87..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_sleepex_test1 - ${SOURCES} -) - -add_dependencies(paltest_sleepex_test1 coreclrpal) - -target_link_libraries(paltest_sleepex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp index ea82e7e9b6f..61bdf136b8f 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp @@ -19,26 +19,26 @@ typedef struct BOOL Alertable; } testCase; -testCase testCases[] = -{ - {0, FALSE}, - {50, FALSE}, - {100, FALSE}, - {500, FALSE}, - {2000, FALSE}, - - {0, TRUE}, - {50, TRUE}, - {100, TRUE}, - {500, TRUE}, - {2000, TRUE}, -}; - -/* Milliseconds of error which are acceptable Function execution time, etc. */ -DWORD AcceptableTimeError = 150; - -int __cdecl main( int argc, char **argv ) +PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/paltest_sleepex_test1") { + /* Milliseconds of error which are acceptable Function execution time, etc. */ + DWORD AcceptableTimeError = 150; + + testCase testCases[] = + { + {0, FALSE}, + {50, FALSE}, + {100, FALSE}, + {500, FALSE}, + {2000, FALSE}, + + {0, TRUE}, + {50, TRUE}, + {100, TRUE}, + {500, TRUE}, + {2000, TRUE}, + }; + UINT64 OldTimeStamp; UINT64 NewTimeStamp; DWORD MaxDelta; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/testinfo.dat deleted file mode 100644 index 29045410a0b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SleepEx -Name = Test #1 for SleepEx -TYPE = DEFAULT -EXE1 = test1 -Description -=Tests that SleepEx correctly sleeps for a given amount of time, -=regardless of the alertable flag. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt deleted file mode 100644 index f3977494913..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_sleepex_test2 - ${SOURCES} -) - -add_dependencies(paltest_sleepex_test2 coreclrpal) - -target_link_libraries(paltest_sleepex_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp index 6365b73412c..96efe6e35d2 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp @@ -32,13 +32,13 @@ const DWORD AcceptableDelta = 150; const int Iterations = 5; -void RunTest(BOOL AlertThread); -VOID PALAPI APCFunc(ULONG_PTR dwParam); -DWORD PALAPI SleeperProc(LPVOID lpParameter); +void RunTest_SleepEx_test2(BOOL AlertThread); +VOID PALAPI APCFunc_SleepEx_test2(ULONG_PTR dwParam); +DWORD PALAPI SleeperProc_SleepEx_test2(LPVOID lpParameter); DWORD ThreadSleepDelta; -int __cdecl main( int argc, char **argv ) +PALTEST(threading_SleepEx_test2_paltest_sleepex_test2, "threading/SleepEx/test2/paltest_sleepex_test2") { int i; DWORD dwAvgDelta; @@ -64,7 +64,7 @@ int __cdecl main( int argc, char **argv ) dwAvgDelta = 0; for (i=0;i<Iterations;i++) { - RunTest(TRUE); + RunTest_SleepEx_test2(TRUE); dwAvgDelta += ThreadSleepDelta - InterruptTime; } dwAvgDelta /= Iterations; @@ -83,7 +83,7 @@ int __cdecl main( int argc, char **argv ) dwAvgDelta = 0; for (i=0;i<Iterations;i++) { - RunTest(FALSE); + RunTest_SleepEx_test2(FALSE); dwAvgDelta += ThreadSleepDelta - ChildThreadSleepTime; } dwAvgDelta /= Iterations; @@ -99,7 +99,7 @@ int __cdecl main( int argc, char **argv ) return PASS; } -void RunTest(BOOL AlertThread) +void RunTest_SleepEx_test2(BOOL AlertThread) { HANDLE hThread = 0; DWORD dwThreadId = 0; @@ -107,7 +107,7 @@ void RunTest(BOOL AlertThread) hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)SleeperProc, + (LPTHREAD_START_ROUTINE)SleeperProc_SleepEx_test2, (LPVOID) AlertThread, 0, &dwThreadId); @@ -123,7 +123,7 @@ void RunTest(BOOL AlertThread) Fail("The creating thread did not sleep!\n"); } - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_SleepEx_test2, hThread, 0); if (ret == 0) { Fail("QueueUserAPC failed! GetLastError returned %d\n", GetLastError()); @@ -138,13 +138,13 @@ void RunTest(BOOL AlertThread) } /* Function doesn't do anything, just needed to interrupt SleepEx */ -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_SleepEx_test2(ULONG_PTR dwParam) { } /* Entry Point for child thread. */ -DWORD PALAPI SleeperProc(LPVOID lpParameter) +DWORD PALAPI SleeperProc_SleepEx_test2(LPVOID lpParameter) { UINT64 OldTimeStamp; UINT64 NewTimeStamp; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/testinfo.dat deleted file mode 100644 index 7880c59207d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SleepEx/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SleepEx -Name = Test #2 for SleepEx -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that a child thread in the middle of a SleepEx call will be -=interrupted by QueueUserAPC if the alert flag was set. - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt deleted file mode 100644 index 4eae7ed164e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_switchtothread_test1 - ${SOURCES} -) - -add_dependencies(paltest_switchtothread_test1 coreclrpal) - -target_link_libraries(paltest_switchtothread_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp index 3d258d8e101..eb268aad2f8 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp @@ -24,14 +24,14 @@ #define THREAD_COUNT 10 #define REPEAT_COUNT 1000 #define TIMEOUT 60000 -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_switchtothread_test1(LPVOID lpParam); /** * main * * executable entry point */ -INT __cdecl main( INT argc, CHAR **argv ) +PALTEST(threading_SwitchToThread_test1_paltest_switchtothread_test1, "threading/SwitchToThread/test1/paltest_switchtothread_test1") { DWORD dwParam; HANDLE hThread[THREAD_COUNT]; @@ -54,7 +54,7 @@ INT __cdecl main( INT argc, CHAR **argv ) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_switchtothread_test1,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -79,7 +79,7 @@ INT __cdecl main( INT argc, CHAR **argv ) } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_switchtothread_test1 (LPVOID lpParam) { int i = 0; int Id=(int)(SIZE_T)lpParam; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/testinfo.dat deleted file mode 100644 index 2147f4af35c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/SwitchToThread/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = SwitchToThread -Name = Test for SwitchToThread -TYPE = DEFAULT -EXE1 = test -Description -= Purpose: Test to ensure SwitchToThread is -= working properly on supported platforms diff --git a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt deleted file mode 100644 index 24e4e4bc9e9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - TerminateProcess.cpp -) - -add_executable(paltest_terminateprocess_test1 - ${SOURCES} -) - -add_dependencies(paltest_terminateprocess_test1 coreclrpal) - -target_link_libraries(paltest_terminateprocess_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp index 189f7094a1c..00e8f4f7ee9 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp @@ -15,7 +15,7 @@ #include <palsuite.h> -INT __cdecl main( int argc, char **argv ) +PALTEST(threading_TerminateProcess_test1_paltest_terminateprocess_test1, "threading/TerminateProcess/test1/paltest_terminateprocess_test1") { HANDLE hProcess; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/testinfo.dat deleted file mode 100644 index fa9c848c34c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/TerminateProcess/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = TerminateProcess -Name = Positive Test for TerminateProcess -TYPE = DEFAULT -EXE1 = terminateprocess -Description -= Test to see if the function TerminateProcess terminates the currently -= running process and passes the appropriate value through uExitCode. - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt deleted file mode 100644 index 333586eac5f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - ThreadPriority.cpp -) - -add_executable(paltest_threadpriority_test1 - ${SOURCES} -) - -add_dependencies(paltest_threadpriority_test1 coreclrpal) - -target_link_libraries(paltest_threadpriority_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp b/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp index b74816560da..eae28fa2e0d 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp @@ -54,7 +54,7 @@ static VOID CheckThreadPriority( HANDLE hThread, int expectedPriority ) * * executable entry point */ -INT __cdecl main( INT argc, CHAR **argv ) +PALTEST(threading_ThreadPriority_test1_paltest_threadpriority_test1, "threading/ThreadPriority/test1/paltest_threadpriority_test1") { /* PAL initialization */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/testinfo.dat deleted file mode 100644 index 8decb5fd48b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/ThreadPriority/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ThreadPriority -Name = Test for GetThreadPriority and SetThreadPriority -TYPE = DEFAULT -EXE1 = threadpriority -Description -= Test to ensure proper operation of the GetThreadPriority -= and SetThreadPriority APIs. The test launches several threads -= of varying priorities, and verifies that the correct priority -= is reported for each. It also verifies that the processing -= time for each test thread is consistent with the priority -= that's set for it. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt deleted file mode 100644 index 7825b6ac58c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_waitformultipleobjects_test1 - ${SOURCES} -) - -add_dependencies(paltest_waitformultipleobjects_test1 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjects_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp index 327ca596857..03a1849bdb6 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp @@ -169,7 +169,7 @@ BOOL WaitForMultipleObjectsTest() return bRet; } -BOOL WaitMultipleDuplicateHandleTest() +BOOL WaitMultipleDuplicateHandleTest_WFMO_test1() { BOOL testResult = TRUE; const HANDLE eventHandle = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -199,7 +199,7 @@ BOOL WaitMultipleDuplicateHandleTest() return testResult; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForMultipleObjects_test1_paltest_waitformultipleobjects_test1, "threading/WaitForMultipleObjects/test1/paltest_waitformultipleobjects_test1") { if(0 != (PAL_Initialize(argc, argv))) @@ -212,7 +212,7 @@ int __cdecl main(int argc, char **argv) Fail ("Test failed\n"); } - if (!WaitMultipleDuplicateHandleTest()) + if (!WaitMultipleDuplicateHandleTest_WFMO_test1()) { Fail("Test failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/testinfo.dat deleted file mode 100644 index 8bd5de43087..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjects -Name = Positive Test for WaitForMultipleObjects -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for WaitForMultipleObjects. Call the function -= on an array of 4 events, and ensure that it returns correct -= results when we do so. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/CMakeLists.txt deleted file mode 100644 index 828a2878bf1..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt deleted file mode 100644 index b6598c97624..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test1 - ${SOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test1 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp index 88f3c33dfcd..a6248f6b519 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp @@ -172,7 +172,7 @@ BOOL WaitForMultipleObjectsExTest() return bRet; } -BOOL WaitMultipleDuplicateHandleTest() +BOOL WaitMultipleDuplicateHandleTest_WFMOEx_test1() { BOOL testResult = TRUE; const HANDLE eventHandle = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -202,7 +202,7 @@ BOOL WaitMultipleDuplicateHandleTest() return testResult; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForMultipleObjectsEx_test1_paltest_waitformultipleobjectsex_test1, "threading/WaitForMultipleObjectsEx/test1/paltest_waitformultipleobjectsex_test1") { if(0 != (PAL_Initialize(argc, argv))) @@ -215,7 +215,7 @@ int __cdecl main(int argc, char **argv) Fail ("Test failed\n"); } - if (!WaitMultipleDuplicateHandleTest()) + if (!WaitMultipleDuplicateHandleTest_WFMOEx_test1()) { Fail("Test failed\n"); } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/testinfo.dat deleted file mode 100644 index cfaac3da7da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjectsEx -Name = Test #1 for WaitForMultipleObjectsEx -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for WaitForMultipleObjectsEx. Call the function -= on an array of 4 events, and ensure that it returns correct -= results when we do so. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt deleted file mode 100644 index 8379cc8b96a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test2.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test2 - ${SOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test2 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test2 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp index 5347ebe1a77..a6f1e07da99 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp @@ -21,13 +21,13 @@ const unsigned int InterruptTime = 500; #define TOLERANCE 10 -void RunTest(BOOL AlertThread); -VOID PALAPI APCFunc(ULONG_PTR dwParam); -DWORD PALAPI WaiterProc(LPVOID lpParameter); +void RunTest_WFMO_test2(BOOL AlertThread); +VOID PALAPI APCFunc_WFMO_test2(ULONG_PTR dwParam); +DWORD PALAPI WaiterProc_WFMO_test2(LPVOID lpParameter); -DWORD ThreadWaitDelta; +DWORD ThreadWaitDelta_WFMO_test2; -int __cdecl main( int argc, char **argv ) +PALTEST(threading_WaitForMultipleObjectsEx_test2_paltest_waitformultipleobjectsex_test2, "threading/WaitForMultipleObjectsEx/test2/paltest_waitformultipleobjectsex_test2") { DWORD delta = 0; @@ -51,34 +51,34 @@ int __cdecl main( int argc, char **argv ) * Check that Queueing an APC in the middle of a wait does interrupt * it, if it's in an alertable state. */ - RunTest(TRUE); + RunTest_WFMO_test2(TRUE); // Make sure that the wait returns in time greater than interrupt and less than // wait timeout - if ( - ((ThreadWaitDelta >= ChildThreadWaitTime) && (ThreadWaitDelta - ChildThreadWaitTime) > TOLERANCE) - || (( ThreadWaitDelta < InterruptTime) && (ThreadWaitDelta - InterruptTime) > TOLERANCE) + if ( + ((ThreadWaitDelta_WFMO_test2 >= ChildThreadWaitTime) && (ThreadWaitDelta_WFMO_test2 - ChildThreadWaitTime) > TOLERANCE) + || (( ThreadWaitDelta_WFMO_test2 < InterruptTime) && (ThreadWaitDelta_WFMO_test2 - InterruptTime) > TOLERANCE) ) { Fail("Expected thread to wait for %d ms (and get interrupted).\n" "Interrupt Time: %d ms, ThreadWaitDelta %u\n", - ChildThreadWaitTime, InterruptTime, ThreadWaitDelta); + ChildThreadWaitTime, InterruptTime, ThreadWaitDelta_WFMO_test2); } /* * Check that Queueing an APC in the middle of a wait does NOT interrupt * it, if it is not in an alertable state. */ - RunTest(FALSE); + RunTest_WFMO_test2(FALSE); // Make sure that time taken for thread to return from wait is more than interrupt // and also not less than the complete child thread wait time - delta = ThreadWaitDelta - ChildThreadWaitTime; - if( (ThreadWaitDelta < ChildThreadWaitTime) && ( delta > TOLERANCE) ) + delta = ThreadWaitDelta_WFMO_test2 - ChildThreadWaitTime; + if( (ThreadWaitDelta_WFMO_test2 < ChildThreadWaitTime) && ( delta > TOLERANCE) ) { Fail("Expected thread to wait for %d ms (and not get interrupted).\n" "Interrupt Time: %d ms, ThreadWaitDelta %u\n", - ChildThreadWaitTime, InterruptTime, ThreadWaitDelta); + ChildThreadWaitTime, InterruptTime, ThreadWaitDelta_WFMO_test2); } @@ -86,7 +86,7 @@ int __cdecl main( int argc, char **argv ) return PASS; } -void RunTest(BOOL AlertThread) +void RunTest_WFMO_test2(BOOL AlertThread) { HANDLE hThread = 0; DWORD dwThreadId = 0; @@ -94,7 +94,7 @@ void RunTest(BOOL AlertThread) hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)WaiterProc, + (LPTHREAD_START_ROUTINE)WaiterProc_WFMO_test2, (LPVOID) AlertThread, 0, &dwThreadId); @@ -107,7 +107,7 @@ void RunTest(BOOL AlertThread) Sleep(InterruptTime); - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_WFMO_test2, hThread, 0); if (ret == 0) { Fail("QueueUserAPC failed! GetLastError returned %d\n", @@ -123,12 +123,12 @@ void RunTest(BOOL AlertThread) } /* Function doesn't do anything, just needed to interrupt the wait*/ -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_WFMO_test2(ULONG_PTR dwParam) { } /* Entry Point for child thread. */ -DWORD PALAPI WaiterProc(LPVOID lpParameter) +DWORD PALAPI WaiterProc_WFMO_test2(LPVOID lpParameter) { HANDLE Semaphore; UINT64 OldTimeStamp; @@ -172,7 +172,7 @@ DWORD PALAPI WaiterProc(LPVOID lpParameter) "Expected return of WAIT_TIMEOUT, got %d.\n", ret); } - ThreadWaitDelta = NewTimeStamp - OldTimeStamp; + ThreadWaitDelta_WFMO_test2 = NewTimeStamp - OldTimeStamp; ret = CloseHandle(Semaphore); if (!ret) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/testinfo.dat deleted file mode 100644 index b0724655025..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjectsEx -Name = Test #2 for WaitForMultipleObjectsEx -TYPE = DEFAULT -EXE1 = test2 -Description -=Tests that a child thread in the middle of a -=WaitForMultipleObjectsEx call will be interrupted by QueueUserAPC -=if the alert flag was set. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt deleted file mode 100644 index ce267b1742d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test3.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test3 - ${SOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test3 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test3 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp index 88ff567566c..319690e5ed0 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp @@ -20,7 +20,7 @@ const int ParentDelayTime = 2000; DWORD PALAPI AcquiringProc(LPVOID lpParameter); -int __cdecl main( int argc, char **argv) +PALTEST(threading_WaitForMultipleObjectsEx_test3_paltest_waitformultipleobjectsex_test3, "threading/WaitForMultipleObjectsEx/test3/paltest_waitformultipleobjectsex_test3") { HANDLE Mutex; HANDLE hThread = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/testinfo.dat deleted file mode 100644 index 09a5127c84e..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjectsEx -Name = Test #3 for WaitForMultipleObjectsEx -TYPE = DEFAULT -EXE1 = test3 -Description -=Tests that waiting on an open mutex will a return -=WAIT_OBJECT_0. Does this by creating a child thread that -=acquires the mutex, releases it, and exits. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt deleted file mode 100644 index ed81a5323d0..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test4.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test4 - ${SOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test4 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test4 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp index c648a7c1e2e..c1589702a44 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp @@ -20,7 +20,7 @@ const int ParentDelayTime = 2000; DWORD PALAPI AbandoningProc(LPVOID lpParameter); -int __cdecl main( int argc, char **argv ) +PALTEST(threading_WaitForMultipleObjectsEx_test4_paltest_waitformultipleobjectsex_test4, "threading/WaitForMultipleObjectsEx/test4/paltest_waitformultipleobjectsex_test4") { HANDLE Mutex; HANDLE hThread = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/testinfo.dat deleted file mode 100644 index a7c0264de62..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjectsEx -Name = Test #4 for WaitForMultipleObjectsEx -TYPE = DEFAULT -EXE1 = test4 -Description -=Tests that waiting on an abandonded mutex will a return -=WAIT_ABANDONED_0. Does this by creating a child thread that -=acquires the mutex and exits. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt deleted file mode 100644 index bf7846aa87a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test5.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test5 - ${TESTSOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test5 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test5 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - helper.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test5_helper - ${HELPERSOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test5_helper coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test5_helper - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/commonconsts.h b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/commonconsts.h index 79283500546..d4e26e4d478 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/commonconsts.h +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/commonconsts.h @@ -15,9 +15,9 @@ const int TIMEOUT = 60 * 5 * 1000; -char *szcHelperProcessStartEvName = "start"; -char *szcHelperProcessReadyEvName = "ready"; -char *szcHelperProcessFinishEvName = "finish"; +#define szcHelperProcessStartEvName "start" +#define szcHelperProcessReadyEvName "ready" +#define szcHelperProcessFinishEvName "finish" /* PEDANTIC and PEDANTIC0 is a helper macro that just grumps about any * zero return codes in a generic way. with little typing */ diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp index 9bfb85af357..de39bad98a3 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp @@ -16,13 +16,13 @@ #include <palsuite.h> -HANDLE hProcessStartEvent; +HANDLE hProcessStartEvent_WFMO_test5_helper; HANDLE hProcessReadyEvent; HANDLE hProcessFinishEvent; HANDLE hProcessCleanupEvent; -int __cdecl main(int argc, char *argv[]) +PALTEST(threading_WaitForMultipleObjectsEx_test5_paltest_waitformultipleobjectsex_test5_helper, "threading/WaitForMultipleObjectsEx/test5/paltest_waitformultipleobjectsex_test5_helper") { BOOL success = TRUE; /* assume success */ @@ -38,9 +38,9 @@ int __cdecl main(int argc, char *argv[]) /* Open the event to let test thread tell us to get started. */ uniString = convert(szcHelperProcessStartEvName); - hProcessStartEvent = OpenEventW(EVENT_ALL_ACCESS, 0, uniString); + hProcessStartEvent_WFMO_test5_helper = OpenEventW(EVENT_ALL_ACCESS, 0, uniString); free(uniString); - if (!hProcessStartEvent) + if (!hProcessStartEvent_WFMO_test5_helper) { Fail("helper.main: OpenEvent of '%S' failed (%u). " "(the event should already exist!)\n", @@ -48,7 +48,7 @@ int __cdecl main(int argc, char *argv[]) } /* Wait for signal from test thread. */ - dwRet = WaitForSingleObject(hProcessStartEvent, TIMEOUT); + dwRet = WaitForSingleObject(hProcessStartEvent_WFMO_test5_helper, TIMEOUT); if (dwRet != WAIT_OBJECT_0) { Fail("helper.main: WaitForSingleObject '%s' failed\n" @@ -111,11 +111,11 @@ int __cdecl main(int argc, char *argv[]) szcHelperProcessFinishEvName, dwProcessId, GetLastError()); } - PEDANTIC(CloseHandle, (hProcessStartEvent)); + PEDANTIC(CloseHandle, (hProcessStartEvent_WFMO_test5_helper)); PEDANTIC(CloseHandle, (hProcessReadyEvent)); PEDANTIC(CloseHandle, (hProcessFinishEvent)); - PAL_Terminate(); + PAL_TerminateEx(success ? PASS : FAIL); return success ? PASS : FAIL; } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp index 0704fad832a..23c7e5eb028 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp @@ -54,7 +54,7 @@ struct helper_process_t HANDLE hProcessFinishEvent; } helper_process[MAX_HELPER_PROCESS]; -HANDLE hProcessStartEvent; +HANDLE hProcessStartEvent_WFMO_test5; struct helper_thread_t { @@ -149,9 +149,9 @@ Setup() /* Create the event to start helper process after it was created. */ uniString = convert(szcHelperProcessStartEvName); - hProcessStartEvent = CreateEvent(NULL, TRUE, FALSE, uniString); + hProcessStartEvent_WFMO_test5 = CreateEvent(NULL, TRUE, FALSE, uniString); free(uniString); - if (!hProcessStartEvent) + if (!hProcessStartEvent_WFMO_test5) { Fail("test5.Setup: CreateEvent of '%s' failed. " "GetLastError() returned %d.\n", szcHelperProcessStartEvName, @@ -214,7 +214,7 @@ Setup() free(uniStringHelper); /* Signal all helper processes to start. */ - if (!SetEvent(hProcessStartEvent)) + if (!SetEvent(hProcessStartEvent_WFMO_test5)) { Fail("test5.Setup: SetEvent '%s' failed\n", "LastError:(%u)\n", @@ -282,7 +282,7 @@ Setup() * Cleanup the helper processes and helper threads. */ DWORD -Cleanup() +Cleanup_WFMO_test5() { DWORD dwExitCode; DWORD dwRet; @@ -323,7 +323,7 @@ Cleanup() } /* Close all process start event. */ - PEDANTIC(CloseHandle, (hProcessStartEvent)); + PEDANTIC(CloseHandle, (hProcessStartEvent_WFMO_test5)); return dwExitCode; } @@ -463,7 +463,7 @@ TestWakeupAllThread() } } -int __cdecl main(int argc, char *argv[]) +PALTEST(threading_WaitForMultipleObjectsEx_test5_paltest_waitformultipleobjectsex_test5, "threading/WaitForMultipleObjectsEx/test5/paltest_waitformultipleobjectsex_test5") { DWORD dwExitCode; @@ -491,13 +491,13 @@ int __cdecl main(int argc, char *argv[]) Setup(); ThreadIndexOfThreadFinishEvent = 3; TestWakeupOneThread(); - dwExitCode = Cleanup(); + dwExitCode = Cleanup_WFMO_test5(); if (PASS == dwExitCode) { Setup(); TestWakeupAllThread(); - dwExitCode = Cleanup(); + dwExitCode = Cleanup_WFMO_test5(); } PAL_TerminateEx(dwExitCode); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/testinfo.dat deleted file mode 100644 index d782113d10a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/testinfo.dat +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForMultipleObjectsEx -Name = Check simultaneously waiting on multiple processes. -TYPE = DEFAULT -EXE1 = test5 -EXE2 = helper -Description -= Create a number of helper processes and helper threads. -= Helper threads wait on helper processes to finish. -= Helper processes wait on the event signal from test -= thread before exit. The test thread then selectively -= signals helper process to finish and then wait on the -= selected helper thread to finish. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt deleted file mode 100644 index 6775951ada4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - test6.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test6 - ${TESTSOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test6 coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test6 - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - child6.cpp -) - -add_executable(paltest_waitformultipleobjectsex_test6_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_waitformultipleobjectsex_test6_child coreclrpal) - -target_link_libraries(paltest_waitformultipleobjectsex_test6_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp index 8e6e9a39800..618c5edeca5 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp @@ -13,7 +13,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForMultipleObjectsEx_test6_paltest_waitformultipleobjectsex_test6_child, "threading/WaitForMultipleObjectsEx/test6/paltest_waitformultipleobjectsex_test6_child") { int i, iRet; BOOL bRet; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp index 6161e5c86c0..80ecbaa2016 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp @@ -582,7 +582,7 @@ DWORD PALAPI TestThread(PVOID pArg) return 0; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForMultipleObjectsEx_test6_paltest_waitformultipleobjectsex_test6, "threading/WaitForMultipleObjectsEx/test6/paltest_waitformultipleobjectsex_test6") { DWORD dwRet; DWORD dwSlaveThreadTid = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/thistest.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/thistest.dat deleted file mode 100644 index 8d361627527..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/thistest.dat +++ /dev/null @@ -1,2 +0,0 @@ - -PAL,threading,palsuite\threading\waitformultipleobjectsex\test6,Test6forWaitForMultipleObjectsEx=test6.c child6.c,<SUPPORTEXE> diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/CMakeLists.txt deleted file mode 100644 index 9620d700dd4..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_subdirectory(test1) -add_subdirectory(WFSOExMutexTest) -add_subdirectory(WFSOExSemaphoreTest) -add_subdirectory(WFSOExThreadTest) -add_subdirectory(WFSOMutexTest) -add_subdirectory(WFSOProcessTest) -add_subdirectory(WFSOSemaphoreTest) -add_subdirectory(WFSOThreadTest) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt deleted file mode 100644 index 838108b3310..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOExMutexTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsoexmutextest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsoexmutextest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsoexmutextest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp index 086a876d6e8..4241df19f98 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp @@ -20,16 +20,16 @@ const int ChildThreadWaitTime = 4000; const int InterruptTime = 2000; const DWORD AcceptableDelta = 300; -void RunTest(BOOL AlertThread); -VOID PALAPI APCFunc(ULONG_PTR dwParam); -DWORD PALAPI WaiterProc(LPVOID lpParameter); +void RunTest_WFSOExMutexTest(BOOL AlertThread); +VOID PALAPI APCFunc_WFSOExMutexTest(ULONG_PTR dwParam); +DWORD PALAPI WaiterProc_WFSOExMutexTest(LPVOID lpParameter); -DWORD ThreadWaitDelta; -HANDLE hMutex; +DWORD ThreadWaitDelta_WFSOExMutexTest; +HANDLE hMutex_WFSOExMutexTest; -int __cdecl main( int argc, char **argv ) +PALTEST(threading_WaitForSingleObject_WFSOExMutexTest_paltest_waitforsingleobject_wfsoexmutextest, "threading/WaitForSingleObject/WFSOExMutexTest/paltest_waitforsingleobject_wfsoexmutextest") { int ret=0; @@ -58,11 +58,11 @@ int __cdecl main( int argc, char **argv ) */ /* Create a mutex that is not in the signalled state */ - hMutex = CreateMutex(NULL, //No security attributes + hMutex_WFSOExMutexTest = CreateMutex(NULL, //No security attributes TRUE, //Iniitally owned NULL); //Name of mutex - if (hMutex == NULL) + if (hMutex_WFSOExMutexTest == NULL) { Fail("Failed to create mutex! GetLastError returned %d.\n", GetLastError()); @@ -72,12 +72,12 @@ int __cdecl main( int argc, char **argv ) * it, if it's in an alertable state. */ - RunTest(TRUE); - if ((ThreadWaitDelta - InterruptTime) > AcceptableDelta) + RunTest_WFSOExMutexTest(TRUE); + if ((ThreadWaitDelta_WFSOExMutexTest - InterruptTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and get interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - InterruptTime, ThreadWaitDelta, AcceptableDelta); + InterruptTime, ThreadWaitDelta_WFSOExMutexTest, AcceptableDelta); } @@ -85,18 +85,18 @@ int __cdecl main( int argc, char **argv ) * Check that Queueing an APC in the middle of a wait does NOT interrupt * it, if it is not in an alertable state. */ - RunTest(FALSE); - if ((ThreadWaitDelta - ChildThreadWaitTime) > AcceptableDelta) + RunTest_WFSOExMutexTest(FALSE); + if ((ThreadWaitDelta_WFSOExMutexTest - ChildThreadWaitTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and not be interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - ChildThreadWaitTime, ThreadWaitDelta, AcceptableDelta); + ChildThreadWaitTime, ThreadWaitDelta_WFSOExMutexTest, AcceptableDelta); } //Release Mutex - ret = ReleaseMutex(hMutex); + ret = ReleaseMutex(hMutex_WFSOExMutexTest); if (0==ret) { Fail("Unable to Release Mutex!\n" @@ -104,7 +104,7 @@ int __cdecl main( int argc, char **argv ) } //Close Mutex Handle - ret = CloseHandle(hMutex); + ret = CloseHandle(hMutex_WFSOExMutexTest); if (!ret) { Fail("Unable to close handle to Mutex!\n" @@ -115,7 +115,7 @@ int __cdecl main( int argc, char **argv ) return PASS; } -void RunTest(BOOL AlertThread) +void RunTest_WFSOExMutexTest(BOOL AlertThread) { HANDLE hThread = 0; @@ -125,7 +125,7 @@ void RunTest(BOOL AlertThread) hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)WaiterProc, + (LPTHREAD_START_ROUTINE)WaiterProc_WFSOExMutexTest, (LPVOID) AlertThread, 0, &dwThreadId); @@ -140,7 +140,7 @@ void RunTest(BOOL AlertThread) Sleep(InterruptTime); - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_WFSOExMutexTest, hThread, 0); if (ret == 0) { @@ -165,12 +165,12 @@ void RunTest(BOOL AlertThread) } /* Function doesn't do anything, just needed to interrupt the wait*/ -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_WFSOExMutexTest(ULONG_PTR dwParam) { } /* Entry Point for child thread. */ -DWORD PALAPI WaiterProc(LPVOID lpParameter) +DWORD PALAPI WaiterProc_WFSOExMutexTest(LPVOID lpParameter) { UINT64 OldTimeStamp; UINT64 NewTimeStamp; @@ -187,7 +187,7 @@ DWORD PALAPI WaiterProc(LPVOID lpParameter) OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency); - ret = WaitForSingleObjectEx( hMutex, + ret = WaitForSingleObjectEx( hMutex_WFSOExMutexTest, ChildThreadWaitTime, Alertable); @@ -204,7 +204,7 @@ DWORD PALAPI WaiterProc(LPVOID lpParameter) "Expected return of WAIT_TIMEOUT, got %d.\n", ret); } - ThreadWaitDelta = NewTimeStamp - OldTimeStamp; + ThreadWaitDelta_WFSOExMutexTest = NewTimeStamp - OldTimeStamp; return 0; } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt deleted file mode 100644 index d28d3eba34b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOExSemaphoreTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsoexsemaphoretest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsoexsemaphoretest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsoexsemaphoretest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp index 0ce353310f9..0f10218bcd0 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp @@ -20,13 +20,13 @@ const int ChildThreadWaitTime = 4000; const int InterruptTime = 2000; const DWORD AcceptableDelta = 300; -void RunTest(BOOL AlertThread); -VOID PALAPI APCFunc(ULONG_PTR dwParam); -DWORD PALAPI WaiterProc(LPVOID lpParameter); +void RunTest_WFSOExSemaphoreTest(BOOL AlertThread); +VOID PALAPI APCFunc_WFSOExSemaphoreTest(ULONG_PTR dwParam); +DWORD PALAPI WaiterProc_WFSOExSemaphoreTest(LPVOID lpParameter); -DWORD ThreadWaitDelta; +DWORD ThreadWaitDelta_WFSOExSemaphoreTest; -int __cdecl main( int argc, char **argv ) +PALTEST(threading_WaitForSingleObject_WFSOExSemaphoreTest_paltest_waitforsingleobject_wfsoexsemaphoretest, "threading/WaitForSingleObject/WFSOExSemaphoreTest/paltest_waitforsingleobject_wfsoexsemaphoretest") { if (0 != (PAL_Initialize(argc, argv))) { @@ -47,12 +47,12 @@ int __cdecl main( int argc, char **argv ) * it, if it's in an alertable state. */ - RunTest(TRUE); - if ((ThreadWaitDelta - InterruptTime) > AcceptableDelta) + RunTest_WFSOExSemaphoreTest(TRUE); + if ((ThreadWaitDelta_WFSOExSemaphoreTest - InterruptTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and get interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - InterruptTime, ThreadWaitDelta, AcceptableDelta); + InterruptTime, ThreadWaitDelta_WFSOExSemaphoreTest, AcceptableDelta); } @@ -60,12 +60,12 @@ int __cdecl main( int argc, char **argv ) * Check that Queueing an APC in the middle of a wait does NOT interrupt * it, if it is not in an alertable state. */ - RunTest(FALSE); - if ((ThreadWaitDelta - ChildThreadWaitTime) > AcceptableDelta) + RunTest_WFSOExSemaphoreTest(FALSE); + if ((ThreadWaitDelta_WFSOExSemaphoreTest - ChildThreadWaitTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and not be interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - ChildThreadWaitTime, ThreadWaitDelta, AcceptableDelta); + ChildThreadWaitTime, ThreadWaitDelta_WFSOExSemaphoreTest, AcceptableDelta); } @@ -73,7 +73,7 @@ int __cdecl main( int argc, char **argv ) return PASS; } -void RunTest(BOOL AlertThread) +void RunTest_WFSOExSemaphoreTest(BOOL AlertThread) { HANDLE hThread = 0; DWORD dwThreadId = 0; @@ -81,7 +81,7 @@ void RunTest(BOOL AlertThread) hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)WaiterProc, + (LPTHREAD_START_ROUTINE)WaiterProc_WFSOExSemaphoreTest, (LPVOID) AlertThread, 0, &dwThreadId); @@ -94,7 +94,7 @@ void RunTest(BOOL AlertThread) Sleep(InterruptTime); - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_WFSOExSemaphoreTest, hThread, 0); if (ret == 0) { Fail("QueueUserAPC failed! GetLastError returned %d\n", @@ -116,12 +116,12 @@ void RunTest(BOOL AlertThread) } /* Function doesn't do anything, just needed to interrupt the wait*/ -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_WFSOExSemaphoreTest(ULONG_PTR dwParam) { } /* Entry Point for child thread. */ -DWORD PALAPI WaiterProc(LPVOID lpParameter) +DWORD PALAPI WaiterProc_WFSOExSemaphoreTest(LPVOID lpParameter) { HANDLE hSemaphore; UINT64 OldTimeStamp; @@ -167,7 +167,7 @@ DWORD PALAPI WaiterProc(LPVOID lpParameter) } - ThreadWaitDelta = NewTimeStamp - OldTimeStamp; + ThreadWaitDelta_WFSOExSemaphoreTest = NewTimeStamp - OldTimeStamp; ret = CloseHandle(hSemaphore); if (!ret) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt deleted file mode 100644 index 683525d8c21..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOExThreadTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsoexthreadtest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsoexthreadtest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsoexthreadtest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp index c1068b4f600..632e8ead536 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp @@ -20,14 +20,14 @@ const int ChildThreadWaitTime = 4000; const int InterruptTime = 2000; const DWORD AcceptableDelta = 300; -void RunTest(BOOL AlertThread); -VOID PALAPI APCFunc(ULONG_PTR dwParam); -DWORD PALAPI WaiterProc(LPVOID lpParameter); -void WorkerThread(void); +void RunTest_WFSOExThreadTest(BOOL AlertThread); +VOID PALAPI APCFunc_WFSOExThreadTest(ULONG_PTR dwParam); +DWORD PALAPI WaiterProc_WFSOExThreadTest(LPVOID lpParameter); +void WorkerThread_WFSOExThreadTest(void); -int ThreadWaitDelta; +int ThreadWaitDelta_WFSOExThreadTest; -int __cdecl main( int argc, char **argv ) +PALTEST(threading_WaitForSingleObject_WFSOExThreadTest_paltest_waitforsingleobject_wfsoexthreadtest, "threading/WaitForSingleObject/WFSOExThreadTest/paltest_waitforsingleobject_wfsoexthreadtest") { if (0 != (PAL_Initialize(argc, argv))) { @@ -48,12 +48,12 @@ int __cdecl main( int argc, char **argv ) * it, if it's in an alertable state. */ - RunTest(TRUE); - if (abs(ThreadWaitDelta - InterruptTime) > AcceptableDelta) + RunTest_WFSOExThreadTest(TRUE); + if (abs(ThreadWaitDelta_WFSOExThreadTest - InterruptTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and get interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - InterruptTime, ThreadWaitDelta, AcceptableDelta); + InterruptTime, ThreadWaitDelta_WFSOExThreadTest, AcceptableDelta); } @@ -61,12 +61,12 @@ int __cdecl main( int argc, char **argv ) * Check that Queueing an APC in the middle of a wait does NOT interrupt * it, if it is not in an alertable state. */ - RunTest(FALSE); - if (abs(ThreadWaitDelta - ChildThreadWaitTime) > AcceptableDelta) + RunTest_WFSOExThreadTest(FALSE); + if (abs(ThreadWaitDelta_WFSOExThreadTest - ChildThreadWaitTime) > AcceptableDelta) { Fail("Expected thread to wait for %d ms (and not be interrupted).\n" "Thread waited for %d ms! (Acceptable delta: %d)\n", - ChildThreadWaitTime, ThreadWaitDelta, AcceptableDelta); + ChildThreadWaitTime, ThreadWaitDelta_WFSOExThreadTest, AcceptableDelta); } @@ -74,7 +74,7 @@ int __cdecl main( int argc, char **argv ) return PASS; } -void RunTest(BOOL AlertThread) +void RunTest_WFSOExThreadTest(BOOL AlertThread) { HANDLE hThread = 0; DWORD dwThreadId = 0; @@ -83,7 +83,7 @@ void RunTest(BOOL AlertThread) //Create thread hThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)WaiterProc, + (LPTHREAD_START_ROUTINE)WaiterProc_WFSOExThreadTest, (LPVOID) AlertThread, 0, &dwThreadId); @@ -96,7 +96,7 @@ void RunTest(BOOL AlertThread) Sleep(InterruptTime); - ret = QueueUserAPC(APCFunc, hThread, 0); + ret = QueueUserAPC(APCFunc_WFSOExThreadTest, hThread, 0); if (ret == 0) { Fail("QueueUserAPC failed! GetLastError returned %d\n", @@ -119,12 +119,12 @@ void RunTest(BOOL AlertThread) } /* Function doesn't do anything, just needed to interrupt the wait*/ -VOID PALAPI APCFunc(ULONG_PTR dwParam) +VOID PALAPI APCFunc_WFSOExThreadTest(ULONG_PTR dwParam) { } /* Entry Point for child thread. */ -DWORD PALAPI WaiterProc(LPVOID lpParameter) +DWORD PALAPI WaiterProc_WFSOExThreadTest(LPVOID lpParameter) { HANDLE hWaitThread; UINT64 OldTimeStamp; @@ -141,7 +141,7 @@ satisfying any threads that were waiting on the object. /* Create a thread that does not return immediately to maintain a non signaled test*/ hWaitThread = CreateThread( NULL, 0, - (LPTHREAD_START_ROUTINE)WorkerThread, + (LPTHREAD_START_ROUTINE)WorkerThread_WFSOExThreadTest, NULL, 0, &dwThreadId); @@ -180,7 +180,7 @@ satisfying any threads that were waiting on the object. "Expected return of WAIT_TIMEOUT, got %d.\n", ret); } - ThreadWaitDelta = NewTimeStamp - OldTimeStamp; + ThreadWaitDelta_WFSOExThreadTest = NewTimeStamp - OldTimeStamp; ret = CloseHandle(hWaitThread); if (!ret) @@ -193,7 +193,7 @@ satisfying any threads that were waiting on the object. } -void WorkerThread(void) +void WorkerThread_WFSOExThreadTest(void) { //Make the worker thread sleep to test WFSOEx Functionality diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt deleted file mode 100644 index 478787f67d9..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOMutexTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsomutextest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsomutextest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsomutextest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp index aa12b37dcfa..9ac6c11bc52 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp @@ -24,17 +24,17 @@ #define NUMBER_OF_WORKER_THREADS 2 //Declaring Variables -HANDLE hMutex = NULL; -unsigned int globalcounter =0; -int testReturnCode = PASS; +HANDLE hMutex_WFSOMutexTest = NULL; +unsigned int globalcounter_WFSOMutexTest =0; +int testReturnCode_WFSOMutexTest = PASS; //Declaring Function Prototypes DWORD PALAPI WFSOMutexTest(LPVOID params); -void incrementCounter(void); +void incrementCounter_WFSOMutexTest(void); -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_WFSOMutexTest_paltest_waitforsingleobject_wfsomutextest, "threading/WaitForSingleObject/WFSOMutexTest/paltest_waitforsingleobject_wfsomutextest") { //Declare local variables @@ -52,13 +52,13 @@ int __cdecl main(int argc, char **argv) } //Create Mutex - hMutex = CreateMutex(NULL, // no security attributes + hMutex_WFSOMutexTest = CreateMutex(NULL, // no security attributes FALSE, // initially not owned NULL); // name of mutex //Check for Mutex Creation - if (hMutex == NULL) + if (hMutex_WFSOMutexTest == NULL) { Fail("Create Mutex Failed, GetLastError: %d\n", GetLastError()); } @@ -90,7 +90,7 @@ int __cdecl main(int argc, char **argv) if( WAIT_OBJECT_0 != returnCode ) { Trace("Wait for Object(s) returned %d, and GetLastError value is %d\n", returnCode, GetLastError()); - testReturnCode = FAIL; + testReturnCode_WFSOMutexTest = FAIL; } //Close thread handles @@ -105,28 +105,28 @@ for (i=0;i<NUMBER_OF_WORKER_THREADS;i++) } //Close Mutex Handle -if (0==CloseHandle(hMutex)) +if (0==CloseHandle(hMutex_WFSOMutexTest)) { Trace("Could not close mutex handle\n"); Fail ( "GetLastError returned %d\n", GetLastError()); } -PAL_TerminateEx(testReturnCode); -return ( testReturnCode ); +PAL_TerminateEx(testReturnCode_WFSOMutexTest); +return ( testReturnCode_WFSOMutexTest ); } -void incrementCounter(void) +void incrementCounter_WFSOMutexTest(void) { - if (INT_MAX == globalcounter) + if (INT_MAX == globalcounter_WFSOMutexTest) { - globalcounter = 0; + globalcounter_WFSOMutexTest = 0; } - globalcounter++; - Trace("Global Counter Value: %d \n", globalcounter); + globalcounter_WFSOMutexTest++; + Trace("Global Counter Value: %d \n", globalcounter_WFSOMutexTest); } @@ -138,7 +138,7 @@ DWORD PALAPI WFSOMutexTest(LPVOID params) // Request ownership of mutex. dwWaitResult = WaitForSingleObject( - hMutex, // handle to mutex + hMutex_WFSOMutexTest, // handle to mutex 5000L); // five-second time-out interval switch (dwWaitResult) @@ -147,10 +147,10 @@ DWORD PALAPI WFSOMutexTest(LPVOID params) case WAIT_OBJECT_0: { - incrementCounter(); + incrementCounter_WFSOMutexTest(); //Release ownership of the mutex object. - if (! ReleaseMutex(hMutex)) + if (! ReleaseMutex(hMutex_WFSOMutexTest)) { Fail ( "ReleaseMutex() returned NULL. Failing test.\n" "GetLastError returned %d\n", GetLastError()); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt deleted file mode 100644 index 5ce14e45b17..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -set(TESTSOURCES - WFSOProcessTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsoprocesstest - ${TESTSOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsoprocesstest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsoprocesstest - ${COMMON_TEST_LIBRARIES} -) - - -set(HELPERSOURCES - ChildProcess.cpp -) - -add_executable(paltest_waitforsingleobject_wfsoprocesstest_child - ${HELPERSOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsoprocesstest_child coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsoprocesstest_child - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp index 7bda0db956a..b8c15d07a4a 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp @@ -16,7 +16,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_WFSOProcessTest_paltest_waitforsingleobject_wfsoprocesstest_child, "threading/WaitForSingleObject/WFSOProcessTest/paltest_waitforsingleobject_wfsoprocesstest_child") { //Declare local variables diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp index f3e6527e4db..dae1fab6f34 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp @@ -19,7 +19,7 @@ #include <palsuite.h> -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_WFSOProcessTest_paltest_waitforsingleobject_wfsoprocesstest, "threading/WaitForSingleObject/WFSOProcessTest/paltest_waitforsingleobject_wfsoprocesstest") { //Declare local variables diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt deleted file mode 100644 index c995da69556..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOSemaphoreTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsosemaphoretest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsosemaphoretest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsosemaphoretest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp index f0a65c391cb..14a22309755 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp @@ -25,18 +25,18 @@ //Declaring Variables -HANDLE hSemaphore = NULL; -unsigned int globalcounter =0; -int testReturnCode = PASS; +HANDLE hSemaphore_WFSOSemaphore = NULL; +unsigned int globalcounter_WFSOSemaphore =0; //Declaring Function Prototypes DWORD PALAPI WFSOSemaphoreTest(LPVOID params); -void incrementCounter(void); +void incrementCounter_WFSOSemaphore(void); -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_WFSOSemaphoreTest_paltest_waitforsingleobject_wfsosemaphoretest, "threading/WaitForSingleObject/WFSOSemaphoreTest/paltest_waitforsingleobject_wfsosemaphoretest") { //Declare local variables + int testReturnCode = PASS; int i =0; int cMax = 2; @@ -53,7 +53,7 @@ int __cdecl main(int argc, char **argv) } //Create Semaphore - hSemaphore = CreateSemaphoreExW( + hSemaphore_WFSOSemaphore = CreateSemaphoreExW( NULL, // no security attributes cMax, // initial count cMax, // maximum count @@ -61,7 +61,7 @@ int __cdecl main(int argc, char **argv) 0, 0); - if (hSemaphore == NULL) + if (hSemaphore_WFSOSemaphore == NULL) { // Check for error. Fail("Create Semaphore Failed, GetLastError: %d\n", GetLastError()); @@ -110,8 +110,8 @@ for (i=0;i<NUMBER_OF_WORKER_THREADS;i++) } } -//Close Semaphore Handle -if (0==CloseHandle(hSemaphore)) +//Close Semaphore Handle +if (0==CloseHandle(hSemaphore_WFSOSemaphore)) { Trace("Could not close semaphore handle\n"); Fail ( "GetLastError returned %d\n", GetLastError()); @@ -123,15 +123,15 @@ return ( testReturnCode ); } -void incrementCounter(void) +void incrementCounter_WFSOSemaphore(void) { - if (INT_MAX == globalcounter) + if (INT_MAX == globalcounter_WFSOSemaphore) { - globalcounter = 0; + globalcounter_WFSOSemaphore = 0; } - globalcounter++; - Trace("Global Counter Value: %d \n", globalcounter); + globalcounter_WFSOSemaphore++; + Trace("Global Counter Value: %d \n", globalcounter_WFSOSemaphore); } @@ -142,8 +142,8 @@ DWORD PALAPI WFSOSemaphoreTest(LPVOID params) // Request ownership of Semaphore - dwWaitResult = WaitForSingleObject( - hSemaphore, // handle to semaphore + dwWaitResult = WaitForSingleObject( + hSemaphore_WFSOSemaphore, // handle to semaphore 0L); // zero-second time-out interval @@ -153,11 +153,11 @@ DWORD PALAPI WFSOSemaphoreTest(LPVOID params) case WAIT_OBJECT_0: { - incrementCounter(); + incrementCounter_WFSOSemaphore(); // Increment the count of the semaphore. if (!ReleaseSemaphore( - hSemaphore, // handle to semaphore + hSemaphore_WFSOSemaphore, // handle to semaphore 1, // increase count by one NULL) ) // not interested in previous count { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt deleted file mode 100644 index 25385447726..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - WFSOThreadTest.cpp -) - -add_executable(paltest_waitforsingleobject_wfsothreadtest - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_wfsothreadtest coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_wfsothreadtest - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp index da386b69a86..589e27a7222 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp @@ -21,15 +21,15 @@ //Declaring Variables -HANDLE hThread = NULL; -HANDLE hEvent = NULL; +HANDLE hThread_WFSOThreadTest = NULL; +HANDLE hEvent_WFSOThreadTest = NULL; -unsigned int globalcounter =0; +unsigned int globalcounter_WFSOThreadTest =0; //Declaring Function Prototypes DWORD PALAPI incrementCounter(LPVOID params); -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_WFSOThreadTest_paltest_waitforsingleobject_wfsothreadtest, "threading/WaitForSingleObject/WFSOThreadTest/paltest_waitforsingleobject_wfsothreadtest") { //Declare local variables @@ -44,8 +44,8 @@ int __cdecl main(int argc, char **argv) //Create Event - hEvent = CreateEvent(NULL,TRUE,FALSE, NULL); - if(hEvent == NULL) + hEvent_WFSOThreadTest = CreateEvent(NULL,TRUE,FALSE, NULL); + if(hEvent_WFSOThreadTest == NULL) { Fail("Create Event Failed\n" "GetLastError returned %d\n", GetLastError()); @@ -53,7 +53,7 @@ int __cdecl main(int argc, char **argv) //Create Thread - hThread = CreateThread( + hThread_WFSOThreadTest = CreateThread( NULL, 0, incrementCounter, @@ -61,7 +61,7 @@ int __cdecl main(int argc, char **argv) 0, &dwThreadId); - if ( NULL == hThread ) + if ( NULL == hThread_WFSOThreadTest ) { Fail ( "CreateThread() returned NULL. Failing test.\n" "GetLastError returned %d\n", GetLastError()); @@ -69,7 +69,7 @@ int __cdecl main(int argc, char **argv) //Wait For Thread to signal start - dwWaitResult = WaitForSingleObject(hEvent,INFINITE); + dwWaitResult = WaitForSingleObject(hEvent_WFSOThreadTest,INFINITE); switch (dwWaitResult) { @@ -102,7 +102,7 @@ int __cdecl main(int argc, char **argv) //Wait for Thread to finish dwWaitResult = WaitForSingleObject( - hThread, //handle to thread + hThread_WFSOThreadTest, //handle to thread 5000L); //Wait Indefinitely @@ -137,12 +137,12 @@ int __cdecl main(int argc, char **argv) //Close Handles -if (0==CloseHandle(hEvent)) +if (0==CloseHandle(hEvent_WFSOThreadTest)) { Trace("Could not Close event handle\n"); Fail ( "GetLastError returned %d\n", GetLastError()); } -if (0==CloseHandle(hThread)) +if (0==CloseHandle(hThread_WFSOThreadTest)) { Trace("Could not Close thread handle\n"); Fail ( "GetLastError returned %d\n", GetLastError()); @@ -157,17 +157,17 @@ DWORD PALAPI incrementCounter(LPVOID params) { //Signal Event so that main thread can start to wait for thread object - if (0==SetEvent(hEvent)) + if (0==SetEvent(hEvent_WFSOThreadTest)) { Fail ( "SetEvent returned Zero. Failing test.\n" "GetLastError returned %d\n", GetLastError()); } - for (globalcounter=0;globalcounter<100000;globalcounter++); + for (globalcounter_WFSOThreadTest=0;globalcounter_WFSOThreadTest<100000;globalcounter_WFSOThreadTest++); //Sleep(5000); - Trace("Global Counter Value: %d \n", globalcounter); + Trace("Global Counter Value: %d \n", globalcounter_WFSOThreadTest); return 0; } diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt deleted file mode 100644 index 556c867778c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_waitforsingleobject_test1 - ${SOURCES} -) - -add_dependencies(paltest_waitforsingleobject_test1 coreclrpal) - -target_link_libraries(paltest_waitforsingleobject_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp index 0fa4a12e511..09bd2dbc1c7 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp @@ -102,7 +102,7 @@ BOOL WaitForSingleObjectTest() return bRet; } -int __cdecl main(int argc, char **argv) +PALTEST(threading_WaitForSingleObject_test1_paltest_waitforsingleobject_test1, "threading/WaitForSingleObject/test1/paltest_waitforsingleobject_test1") { if(0 != (PAL_Initialize(argc, argv))) { diff --git a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/testinfo.dat deleted file mode 100644 index 0a15d833401..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = WaitForSingleObject -Name = Positive Test for WaitForSingleObject -TYPE = DEFAULT -EXE1 = test1 -Description -= Test for WaitForSingleObject. Create two events, one -= with a TRUE and one with FALSE intial state. Ensure that WaitForSingle -= returns correct values for each of these. diff --git a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt deleted file mode 100644 index 7c88f9cfbef..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test1.cpp -) - -add_executable(paltest_yieldprocessor_test1 - ${SOURCES} -) - -add_dependencies(paltest_yieldprocessor_test1 coreclrpal) - -target_link_libraries(paltest_yieldprocessor_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp index 665bdfa89d4..ca0a9cbf685 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp @@ -24,14 +24,14 @@ #define THREAD_COUNT 10 #define REPEAT_COUNT 1000 #define TIMEOUT 60000 -void PALAPI Run_Thread(LPVOID lpParam); +void PALAPI Run_Thread_yieldprocessor_test1(LPVOID lpParam); /** * main * * executable entry point */ -INT __cdecl main( INT argc, CHAR **argv ) +PALTEST(threading_YieldProcessor_test1_paltest_yieldprocessor_test1, "threading/YieldProcessor/test1/paltest_yieldprocessor_test1") { DWORD dwParam; HANDLE hThread[THREAD_COUNT]; @@ -54,7 +54,7 @@ INT __cdecl main( INT argc, CHAR **argv ) hThread[i] = CreateThread( NULL, /* no security attributes */ 0, /* use default stack size */ - (LPTHREAD_START_ROUTINE)Run_Thread,/* thread function */ + (LPTHREAD_START_ROUTINE)Run_Thread_yieldprocessor_test1,/* thread function */ (LPVOID)dwParam, /* argument to thread function */ 0, /* use default creation flags */ &threadId[i] /* returns the thread identifier*/ @@ -79,7 +79,7 @@ INT __cdecl main( INT argc, CHAR **argv ) } -void PALAPI Run_Thread (LPVOID lpParam) +void PALAPI Run_Thread_yieldprocessor_test1 (LPVOID lpParam) { int i = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/testinfo.dat deleted file mode 100644 index fa1163e7c61..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/YieldProcessor/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = YieldProcessor -Name = Test for YieldProcessor -TYPE = DEFAULT -EXE1 = test -Description -= Purpose: Test to ensure YieldProcessor is -= working properly on supported platforms diff --git a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/CMakeLists.txt deleted file mode 100644 index 91794df7d0f..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt deleted file mode 100644 index 773319c584c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(SOURCES - test.cpp -) - -add_executable(paltest_releasesemaphore_test1 - ${SOURCES} -) - -add_dependencies(paltest_releasesemaphore_test1 coreclrpal) - -target_link_libraries(paltest_releasesemaphore_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp b/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp index 9875193a39d..83d8688e3d6 100644 --- a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp +++ b/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp @@ -15,10 +15,10 @@ #include <palsuite.h> -HANDLE hSemaphore; -int __cdecl main (int argc, char **argv) +PALTEST(threading_releasesemaphore_test1_paltest_releasesemaphore_test1, "threading/releasesemaphore/test1/paltest_releasesemaphore_test1") { + HANDLE hSemaphore; if(0 != (PAL_Initialize(argc, argv))) { return (FAIL); diff --git a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/testinfo.dat deleted file mode 100644 index 5af762fd8bd..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/threading/releasesemaphore/test1/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. - -Version = 1.0 -Section = threading -Function = ReleaseSemaphore -Name = Positive Test for ReleaseSemaphore -TYPE = DEFAULT -EXE1 = test -Description -= Check that ReleaseSemaphore fails when using a semaphore handle -= which has been closed by a call to CloseHandle. Check that -= ReleaseSemaphore fails when using a ReleaseCount of zero or less than -= zero. diff --git a/src/coreclr/src/tools/crossgen/CMakeLists.txt b/src/coreclr/src/tools/crossgen/CMakeLists.txt index 8d861b68df5..4af88ce4dc1 100644 --- a/src/coreclr/src/tools/crossgen/CMakeLists.txt +++ b/src/coreclr/src/tools/crossgen/CMakeLists.txt @@ -80,4 +80,4 @@ add_subdirectory(../../zap ../../zap) add_subdirectory(../../vm/crossgen ../../vm/crossgen) # add the install targets -install_clr(TARGETS crossgen ADDITIONAL_DESTINATION sharedFramework) +install_clr(TARGETS crossgen ADDITIONAL_DESTINATIONS sharedFramework) diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index 13b4897d17c..6bd37930d9b 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -35,7 +35,8 @@ TimeoutPerTestInMinutes=$(_TimeoutPerTestInMinutes); RuntimeVariant=$(_RuntimeVariant); BundledNETCoreAppPackageVersion=$(BundledNETCoreAppPackageVersion); - HelixRuntimeRid=$(HelixRuntimeRid) + HelixRuntimeRid=$(HelixRuntimeRid); + PALTestsDir=$(_PALTestsDir) </_PropertiesToPass> @@ -54,6 +55,7 @@ <MSBuild Projects="$(MSBuildProjectFile)" Targets="PrepareCorrelationPayloadDirectory" /> <MSBuild Projects="$(MSBuildProjectFile)" Targets="PreparePayloadsDirectories" Properties="Scenarios=$(_Scenarios)" StopOnFirstFailure="true" /> + <MSBuild Projects="$(MSBuildProjectFile)" Targets="PreparePALTestArchive" Properties="$(_PropertiesToPass)" StopOnFirstFailure="true" /> <ItemGroup> <_Scenarios Include="$(_Scenarios.Split(','))" /> @@ -86,6 +88,7 @@ <BinDir>$([MSBuild]::NormalizeDirectory($(TestWorkingDir)))</BinDir> <CoreRootDirectory>$(BinDir)Tests\Core_Root\</CoreRootDirectory> <PayloadsRootDirectory>$(BinDir)Payloads\</PayloadsRootDirectory> + <PayloadsRootDirectory>$([MSBuild]::NormalizeDirectory($(PayloadsRootDirectory)))</PayloadsRootDirectory> <TestEnvFileName Condition=" '$(TargetsWindows)' == 'true' ">SetStressModes_$(Scenario).cmd</TestEnvFileName> <TestEnvFileName Condition=" '$(TargetsWindows)' != 'true' ">SetStressModes_$(Scenario).sh</TestEnvFileName> @@ -193,6 +196,12 @@ <MSBuild Projects="@(_ProjectsToBuild)" Targets="CreateTestEnvFile" StopOnFirstFailure="true" /> </Target> + <Target Name="PreparePALTestArchive"> + <Exec Condition="'$(PALTestsDir)' != '' and '$(TargetsWindows)' != 'true'" + WorkingDirectory="$(PALTestsDir)" + Command="tar -czvf $(PayloadsRootDirectory)paltests.tar.gz `ls -A`"/> + </Target> + <Target Name="PreparePayloadsDirectories" DependsOnTargets="PreparePayloadDirectory"> <PropertyGroup> <_PayloadGroups>@(_XUnitWrapperDll->Metadata('PayloadGroup')->DistinctWithCase())</_PayloadGroups> @@ -304,6 +313,12 @@ <Command Condition=" '%(TestGroup)' != '' ">dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup)</Command> <Timeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</Timeout> </HelixWorkItem> + + <HelixWorkItem Condition="'$(PALTestsDir)' != '' and '$(TargetsWindows)' != 'true'" Include="PALTests"> + <PayloadArchive>$(PayloadsRootDirectory)paltests.tar.gz</PayloadArchive> + <Command>./runpaltestshelix.sh</Command> + <Timeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</Timeout> + </HelixWorkItem> </ItemGroup> <Import Sdk="Microsoft.DotNet.Helix.Sdk" Project="Sdk.targets" Condition=" '$(UsesHelixSdk)' == 'true' " /> |