Added parameter allowing script.system to execute synchronously

Author: yurii-litvinov

tests/trikScriptRunnerTests/data/async-system-test.js

@@ -0,0 +1 @@
+script.system("sleep 2 && echo 123 > test");

tests/trikScriptRunnerTests/data/sync-system-test.js

@@ -0,0 +1 @@
+script.system("sleep 2 && echo 123 > test", true);

tests/trikScriptRunnerTests/trikScriptRunnerTest.cpp

@@ -16,6 +16,8 @@
 
 #include <QtCore/QScopedPointer>
 #include <QtCore/QEventLoop>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
 
 #include <QtScript/QScriptContext>
 #include <QtScript/QScriptEngine>
@@ -70,6 +72,13 @@ void TrikScriptRunnerTest::runFromFile(const QString &fileName)
 	run(fileContents);
 }
 
+void TrikScriptRunnerTest::wait(int msec)
+{
+	QEventLoop waitingLoop;
+	QTimer::singleShot(msec, &waitingLoop, SLOT(quit()));
+	waitingLoop.exec();
+}
+
 TEST_F(TrikScriptRunnerTest, sanityCheck)
 {
 	run("1 + 1");
@@ -79,3 +88,23 @@ TEST_F(TrikScriptRunnerTest, fileTest)
 {
 	runFromFile("file-test.js");
 }
+
+TEST_F(TrikScriptRunnerTest, asyncSystemTest)
+{
+	QFile testFile("test");
+	testFile.remove();
+	ASSERT_FALSE(testFile.exists());
+	runFromFile("async-system-test.js");
+	ASSERT_FALSE(testFile.exists());
+	wait(2100);
+	ASSERT_TRUE(testFile.exists());
+}
+
+TEST_F(TrikScriptRunnerTest, syncSystemTest)
+{
+	QFile testFile("test");
+	testFile.remove();
+	ASSERT_FALSE(testFile.exists());
+	runFromFile("sync-system-test.js");
+	ASSERT_TRUE(testFile.exists());
+}

tests/trikScriptRunnerTests/trikScriptRunnerTest.h

@@ -30,7 +30,7 @@ class TrikScriptRunnerTest : public testing::Test
 
 	void run(const QString &script);
 	void runFromFile(const QString &fileName);
-
+	static void wait(int msec);
 
 private:
 	QScopedPointer<trikControl::BrickInterface> mBrick;

tests/trikScriptRunnerTests/trikScriptRunnerTests.pro

@@ -30,3 +30,7 @@ OTHER_FILES += \
 uses(trikKernel trikControl trikScriptRunner trikNetwork)
 
 copyToDestdir($$PWD/data/, now)
+
+DISTFILES += \
+    data/sync-system-test.js \
+    data/async-system-test.js

trikScriptRunner/src/scriptExecutionControl.cpp

@@ -88,11 +88,16 @@ void ScriptExecutionControl::quit()
 	emit quitSignal();
 }
 
-void ScriptExecutionControl::system(const QString &command)
+void ScriptExecutionControl::system(const QString &command, bool synchronously)
 {
-	QStringList args{"-c", command};
-	QLOG_INFO() << "Running: " << "sh" << args;
-	QProcess::startDetached("sh", args);
+	if (!synchronously) {
+		QStringList args{"-c", command};
+		QLOG_INFO() << "Running: " << "sh" << args;
+		QProcess::startDetached("sh", args);
+	} else {
+		QLOG_INFO() << "Running synchronously: " << command;
+		::system(command.toStdString().c_str());
+	}
 }
 
 void ScriptExecutionControl::writeToFile(const QString &file, const QString &text)

trikScriptRunner/src/scriptExecutionControl.h

@@ -54,8 +54,8 @@ public slots:
 	/// Aborts script execution.
 	void quit();
 
-	/// Asynchronously execute given sh command.
-	void system(const QString &command);
+	/// Execute given sh command.
+	void system(const QString &command, bool synchronously = false);
 
 	/// Appends given text to the end of a file.
 	void writeToFile(const QString &file, const QString &text);