kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Need to quote args when generating batch scripts from ctest

Browse Source
This commit is contained in:
Zach Mullen 2009-09-21 14:21:41 -04:00
parent e4293b4b38
commit 87b4c66ca8
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/CTest/cmCTestBatchTestHandler.cxx
View File

@ -1,3 +1,20 @@
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile$
Language: C++
Date: $Date$
Version: $Revision$
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "cmCTestBatchTestHandler.h" #include "cmCTestBatchTestHandler.h"
#include "cmProcess.h" #include "cmProcess.h"
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
@ -23,7 +40,7 @@ void cmCTestBatchTestHandler::WriteBatchScript()
+ "/Testing/CTestBatch.txt"; + "/Testing/CTestBatch.txt";
std::fstream fout; std::fstream fout;
fout.open(this->Script.c_str(), std::ios::out); fout.open(this->Script.c_str(), std::ios::out);
fout << "# !/bin/sh\n"; fout << "#!/bin/sh\n";
for(TestMap::iterator i = this->Tests.begin(); i != this->Tests.end(); ++i) for(TestMap::iterator i = this->Tests.begin(); i != this->Tests.end(); ++i)
{ {
@ -90,7 +107,7 @@ void cmCTestBatchTestHandler::WriteTestCommand(int test, std::fstream& fout)
++i; //the executable (command) ++i; //the executable (command)
for(; i != args.end(); ++i) for(; i != args.end(); ++i)
{ {
fout << *i << " "; //args to the test executable fout << "\"" << *i << "\" "; //args to the test executable
} }
//TODO ZACH build TestResult.FullCommandLine //TODO ZACH build TestResult.FullCommandLine
//this->TestResult.FullCommandLine = this->TestCommand; //this->TestResult.FullCommandLine = this->TestCommand;

17
Source/CTest/cmCTestBatchTestHandler.h
View File

@ -1,3 +1,20 @@
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile$
Language: C++
Date: $Date$
Version: $Revision$
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef cmCTestBatchTestHandler_h #ifndef cmCTestBatchTestHandler_h
#define cmCTestBatchTestHandler_h #define cmCTestBatchTestHandler_h