forked from qt-creator/qt-creator
tst_QtcProcess: Rename ProcessChannelForwarding into ChannelForwarding
Amends 91c11c769f
Change-Id: Ib38edca1f720a313c42ee6224cbd9109fb50fa84
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -249,7 +249,7 @@ private:
|
|||||||
SUB_CREATOR_PROCESS(ExitCode);
|
SUB_CREATOR_PROCESS(ExitCode);
|
||||||
SUB_CREATOR_PROCESS(RunBlockingStdOut);
|
SUB_CREATOR_PROCESS(RunBlockingStdOut);
|
||||||
SUB_CREATOR_PROCESS(LineCallback);
|
SUB_CREATOR_PROCESS(LineCallback);
|
||||||
SUB_CREATOR_PROCESS(ProcessChannelForwarding);
|
SUB_CREATOR_PROCESS(ChannelForwarding);
|
||||||
SUB_CREATOR_PROCESS(StandardOutputAndErrorWriter);
|
SUB_CREATOR_PROCESS(StandardOutputAndErrorWriter);
|
||||||
SUB_CREATOR_PROCESS(KillBlockingProcess);
|
SUB_CREATOR_PROCESS(KillBlockingProcess);
|
||||||
SUB_CREATOR_PROCESS(EmitOneErrorOnCrash);
|
SUB_CREATOR_PROCESS(EmitOneErrorOnCrash);
|
||||||
@@ -1180,12 +1180,12 @@ void tst_QtcProcess::notRunningAfterStartingNonExistingProgram()
|
|||||||
// a process and start it, because in this case there is no way on how to check whether something
|
// a process and start it, because in this case there is no way on how to check whether something
|
||||||
// went into our output channels or not.
|
// went into our output channels or not.
|
||||||
|
|
||||||
// So we start two processes in chain instead. On the beginning the processChannelForwarding()
|
// So we start two processes in chain instead. On the beginning the channelForwarding()
|
||||||
// test starts the ProcessChannelForwarding::main() - this one will start another process
|
// test starts the ChannelForwarding::main() - this one will start another process
|
||||||
// StandardOutputAndErrorWriter::main() with forwarding options.
|
// StandardOutputAndErrorWriter::main() with forwarding options.
|
||||||
// The StandardOutputAndErrorWriter::main() is very simple - it just puts something to the output
|
// The StandardOutputAndErrorWriter::main() is very simple - it just puts something to the output
|
||||||
// and the error channels. Then ProcessChannelForwarding::main() either forwards these channels
|
// and the error channels. Then ChannelForwarding::main() either forwards these channels
|
||||||
// or not - we check it in the outer processChannelForwarding() test.
|
// or not - we check it in the outer channelForwarding() test.
|
||||||
|
|
||||||
static const char s_outputData[] = "This is the output message.";
|
static const char s_outputData[] = "This is the output message.";
|
||||||
static const char s_errorData[] = "This is the error message.";
|
static const char s_errorData[] = "This is the error message.";
|
||||||
@@ -1197,7 +1197,7 @@ void tst_QtcProcess::StandardOutputAndErrorWriter::main()
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QtcProcess::ProcessChannelForwarding::main()
|
void tst_QtcProcess::ChannelForwarding::main()
|
||||||
{
|
{
|
||||||
const QProcess::ProcessChannelMode channelMode
|
const QProcess::ProcessChannelMode channelMode
|
||||||
= QProcess::ProcessChannelMode(qEnvironmentVariableIntValue(envVar()));
|
= QProcess::ProcessChannelMode(qEnvironmentVariableIntValue(envVar()));
|
||||||
@@ -1232,7 +1232,7 @@ void tst_QtcProcess::channelForwarding()
|
|||||||
QFETCH(bool, outputForwarded);
|
QFETCH(bool, outputForwarded);
|
||||||
QFETCH(bool, errorForwarded);
|
QFETCH(bool, errorForwarded);
|
||||||
|
|
||||||
SubCreatorConfig subConfig(ProcessChannelForwarding::envVar(), QString::number(int(channelMode)));
|
SubCreatorConfig subConfig(ChannelForwarding::envVar(), QString::number(int(channelMode)));
|
||||||
TestProcess process;
|
TestProcess process;
|
||||||
subConfig.setupSubProcess(&process);
|
subConfig.setupSubProcess(&process);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user