mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
* upstream-KWSys:
  KWSys 2019-01-14 (1541d849)
This commit is contained in:
Brad King
2019-01-14 07:38:40 -05:00
parent 848dc85187 a4841e12c0
commit 0d88739736
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/kwsys/ProcessUNIX.c
View File

@@ -1162,7 +1162,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
case KWSYSPE_PIPE_STDERR:
wd->PipeId = kwsysProcess_Pipe_STDERR;
break;
};
}
return 1;
}
} else if (n < 0 && errno == EAGAIN) {

35
Source/kwsys/testCommandLineArguments.cxx
View File

@@ -165,25 +165,26 @@ int testCommandLineArguments(int argc, char* argv[])
}
size_t cc;
#define CompareTwoLists(list1, list_valid, lsize) \
if (list1.size() != lsize) { \
std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \
<< " should be: " << lsize << std::endl; \
res = 1; \
} else { \
std::cout << #list1 " argument set:"; \
for (cc = 0; cc < lsize; ++cc) { \
std::cout << " " << list1[cc]; \
if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \
std::cerr << "Problem setting " #list1 ". Value of " << cc \
<< " is: [" << list1[cc] << "] <> [" << list_valid[cc] \
<< "]" << std::endl; \
res = 1; \
break; \
do { \
if (list1.size() != lsize) { \
std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \
<< " should be: " << lsize << std::endl; \
res = 1; \
} else { \
std::cout << #list1 " argument set:"; \
for (cc = 0; cc < lsize; ++cc) { \
std::cout << " " << list1[cc]; \
if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \
std::cerr << "Problem setting " #list1 ". Value of " << cc \
<< " is: [" << list1[cc] << "] <> [" << list_valid[cc] \
<< "]" << std::endl; \
res = 1; \
break; \
} \
} \
std::cout << std::endl; \
} \
std::cout << std::endl; \
}
} while (0)
CompareTwoLists(numbers_argument, valid_numbers, 10);
CompareTwoLists(doubles_argument, valid_doubles, 3);
CompareTwoLists(bools_argument, valid_bools, 3);