[ros-diffs] [hbelusca] 67442: [REACTOS]: Add a "testdata" subdirectory in %SystemRoot%\bin\ where you can put all needed extra files for the tests. In addition, all the files present in your rostests\testdata ...

Author: hbelusca
Date: Sun Apr 26 17:47:55 2015
New Revision: 67442

URL: http://svn.reactos.org/svn/reactos?rev=67442&view=rev
Log:
[REACTOS]: Add a "testdata" subdirectory in %SystemRoot%\bin\ where you can put
all needed extra files for the tests. In addition, all the files present in your
rostests\testdata local directory of your working copy are also copied into
%SystemRoot%\bin\testdata .

Added:
    trunk/rostests/testdata/   (with props)
    trunk/rostests/testdata/README.txt   (with props)
Modified:
    trunk/reactos/cmake/CMakeMacros.cmake
    trunk/rostests/CMakeLists.txt
    trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt

Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake	[iso-8859-1] Sun Apr 26 17:47:55 2015
@@ -171,7 +171,7 @@
         set(${var} 6)
     elseif(${dir} STREQUAL reactos/bin)
         set(${var} 7)
-    elseif(${dir} STREQUAL reactos/bin/data)
+    elseif(${dir} STREQUAL reactos/bin/testdata)
         set(${var} 8)
     elseif(${dir} STREQUAL reactos/media)
         set(${var} 9)

Modified: trunk/rostests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=67442&…
==============================================================================
--- trunk/rostests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/CMakeLists.txt	[iso-8859-1] Sun Apr 26 17:47:55 2015
@@ -12,4 +12,13 @@
 #add_subdirectory(win32)
 add_subdirectory(winetests)
 
+
+## Extra files needed for the various tests can be added into the "testdata"
subdirectory.
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/)
+    file(GLOB_RECURSE TESTDATA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/
${CMAKE_CURRENT_SOURCE_DIR}/testdata/*)
+    foreach(item ${TESTDATA_FILES})
+        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/${item} DESTINATION
reactos/bin/testdata NAME_ON_CD ${item} FOR regtest)
+    endforeach(item)
+endif()
+
 end_module_group()

Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt…
==============================================================================
--- trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt	[iso-8859-1] Sun Apr 26
17:47:55 2015
@@ -2,4 +2,4 @@
 add_executable(CmdLineUtil CmdLineUtil.c)
 set_module_type(CmdLineUtil win32gui UNICODE)
 add_importlibs(CmdLineUtil msvcrt kernel32 ntdll)
-add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/data FOR all)
+add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/testdata FOR all)

Propchange: trunk/rostests/testdata/
------------------------------------------------------------------------------
--- bugtraq:logregex	(added)
+++ bugtraq:logregex	Sun Apr 26 17:47:55 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/rostests/testdata/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/rostests/testdata/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Added: trunk/rostests/testdata/README.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/testdata/README.txt?rev=6…
==============================================================================
--- trunk/rostests/testdata/README.txt	(added)
+++ trunk/rostests/testdata/README.txt	[iso-8859-1] Sun Apr 26 17:47:55 2015
@@ -0,0 +1,2 @@
+This directory contains all the extra files needed for the various tests to run.
+They are copied into the subdirectory %SystemRoot%\bin\testdata.

Propchange: trunk/rostests/testdata/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native