Give an error if 2D content is set to 3D (#1565). Also run

3D tests with more parallel jobs to speed them up.

Backported from 11c07c6fd98620c859c7d3dcf6a4bbf6a05e567e in v2.15.x.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index e0b72994d..2788fc657 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -32,6 +32,7 @@
 class Job;
 class Film;
 class Playlist;
+struct threed_test7;
 
 extern bool wait_for_jobs ();
 
@@ -73,6 +74,7 @@ public:
 private:
 	/* This function is part of the test suite */
 	friend bool ::wait_for_jobs ();
+	friend struct threed_test7;
 
 	JobManager ();
 	~JobManager ();