Skip to content

Commit 6785773

Browse files
committed
TestThreadExecutor: run tests with quiet flag
1 parent 771ea7b commit 6785773

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

test/testthreadexecutor.cpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class TestThreadExecutor : public TestFixture {
4949
struct CheckOptions
5050
{
5151
CheckOptions() DINIT_NOEXCEPT = default;
52+
bool quiet = false;
5253
SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
5354
const char* plistOutput = nullptr;
5455
std::vector<std::string> filesList;
@@ -80,6 +81,7 @@ class TestThreadExecutor : public TestFixture {
8081
Settings settings1 = settings;
8182
settings1.jobs = jobs;
8283
settings1.showtime = opt.showtime;
84+
settings1.quiet = opt.quiet;
8385
if (opt.plistOutput)
8486
settings1.plistOutput = opt.plistOutput;
8587
// TODO: test with settings.project.fileSettings;
@@ -114,16 +116,17 @@ class TestThreadExecutor : public TestFixture {
114116

115117
oss << " return 0;\n"
116118
<< "}\n";
117-
check(2, 3, 3, oss.str());
119+
check(2, 3, 3, oss.str(), true);
118120
}
119121

122+
// TODO: check the output
120123
void many_threads() {
121124
check(16, 100, 100,
122125
"int main()\n"
123126
"{\n"
124127
" char *a = malloc(10);\n"
125128
" return 0;\n"
126-
"}");
129+
"}", true);
127130
}
128131

129132
// #11249 - reports TSAN errors - only applies to threads not processes though
@@ -134,7 +137,9 @@ class TestThreadExecutor : public TestFixture {
134137
"{\n"
135138
" char *a = malloc(10);\n"
136139
" return 0;\n"
137-
"}", dinit(CheckOptions, $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
140+
"}", dinit(CheckOptions,
141+
$.quiet = true,
142+
$.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
138143
}
139144

140145
void many_threads_plist() {
@@ -146,31 +151,33 @@ class TestThreadExecutor : public TestFixture {
146151
"{\n"
147152
" char *a = malloc(10);\n"
148153
" return 0;\n"
149-
"}", dinit(CheckOptions, $.plistOutput = plistOutput));
154+
"}", dinit(CheckOptions,
155+
$.quiet = true,
156+
$.plistOutput = plistOutput));
150157
}
151158

152159
void no_errors_more_files() {
153160
check(2, 3, 0,
154161
"int main()\n"
155162
"{\n"
156163
" return 0;\n"
157-
"}");
164+
"}", true);
158165
}
159166

160167
void no_errors_less_files() {
161168
check(2, 1, 0,
162169
"int main()\n"
163170
"{\n"
164171
" return 0;\n"
165-
"}");
172+
"}", true);
166173
}
167174

168175
void no_errors_equal_amount_files() {
169176
check(2, 2, 0,
170177
"int main()\n"
171178
"{\n"
172179
" return 0;\n"
173-
"}");
180+
"}", true);
174181
}
175182

176183
void one_error_less_files() {
@@ -179,7 +186,7 @@ class TestThreadExecutor : public TestFixture {
179186
"{\n"
180187
" {char *a = malloc(10);}\n"
181188
" return 0;\n"
182-
"}");
189+
"}", true);
183190
}
184191

185192
void one_error_several_files() {
@@ -188,7 +195,7 @@ class TestThreadExecutor : public TestFixture {
188195
"{\n"
189196
" {char *a = malloc(10);}\n"
190197
" return 0;\n"
191-
"}");
198+
"}", true);
192199
}
193200

194201
void markup() {

0 commit comments

Comments
 (0)