Set new ctest tests to always run, whether CTEST_TEST_CTEST is enabled or not. Changed parallel test to be portable.

3 files changed, 21 insertions, 22 deletions

diff --git a/Tests/CTestTestParallel/CMakeLists.txt b/Tests/CTestTestParallel/CMakeLists.txt
index b6d31b3b47..1e57074d5e 100644
--- a/Tests/CTestTestParallel/CMakeLists.txt
+++ b/Tests/CTestTestParallel/CMakeLists.txt
@@ -8,8 +8,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
 GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH)
 SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest")
 
-ADD_EXECUTABLE (LockFile lockFile.cxx)
-TARGET_LINK_LIBRARIES (NoBuild ${EXTRA_LIBS})
+ADD_EXECUTABLE (LockFile lockFile.c)
 
 ENABLE_TESTING ()
 
diff --git a/Tests/CTestTestParallel/lockFile.c b/Tests/CTestTestParallel/lockFile.c
new file mode 100644
index 0000000000..7942b72266
--- /dev/null
+++ b/Tests/CTestTestParallel/lockFile.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+
+//if run serially, works fine
+//if run in parallel, someone will attempt to delete
+//a locked file, which will fail
+int main()
+{
+  FILE* file;
+  int i;
+  const char* fname = "lockedFile.txt";
+  file = fopen(fname, "w");
+
+  for(i = 0; i < 10000; i++)
+    {
+    fprintf(file, "%s", "x");
+    fflush(file);
+    }
+  fclose(file);
+  return remove(fname);
+}
diff --git a/Tests/CTestTestParallel/lockFile.cxx b/Tests/CTestTestParallel/lockFile.cxx
deleted file mode 100644
index e46d0fd9ef..0000000000
--- a/Tests/CTestTestParallel/lockFile.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-#include <fstream>
-
-//if run serially, works fine
-//if run in parallel, someone will attempt to delete
-//a locked file, which will fail
-int main()
-{
-  std::string fname = "lockedFile.txt";
-  std::fstream fout;
-  fout.open(fname.c_str(), std::ios::out);
-
-  for(int i = 0; i < 10000; i++)
-  {
-    fout << "x";
-    fout.flush();
-  }
-  fout.close();
-  return std::remove("lockedFile.txt");
-}