Preserve --dir parameter after updating Allow more than one copy of a command line parameter in MultiMC Linux runner script no longer changes current directory, which allows '--dir .' Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed) [fixes 63127704]
		
			
				
	
	
		
			47 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#pragma once
 | 
						|
 | 
						|
#include <QFile>
 | 
						|
#include <QCoreApplication>
 | 
						|
#include <QTest>
 | 
						|
#include <QDir>
 | 
						|
 | 
						|
#include "MultiMC.h"
 | 
						|
 | 
						|
struct TestsInternal
 | 
						|
{
 | 
						|
        static QByteArray readFile(const QString &fileName)
 | 
						|
        {
 | 
						|
                QFile f(fileName);
 | 
						|
                f.open(QFile::ReadOnly);
 | 
						|
                return f.readAll();
 | 
						|
        }
 | 
						|
		static QString readFileUtf8(const QString &fileName)
 | 
						|
		{
 | 
						|
			return QString::fromUtf8(readFile(fileName));
 | 
						|
		}
 | 
						|
};
 | 
						|
 | 
						|
#define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA( file ))
 | 
						|
#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA( file ))
 | 
						|
 | 
						|
#ifdef Q_OS_LINUX
 | 
						|
# define _MMC_EXTRA_ARGV , "-platform", "offscreen"
 | 
						|
# define _MMC_EXTRA_ARGC 2
 | 
						|
#else
 | 
						|
# define _MMC_EXTRA_ARGV
 | 
						|
# define _MMC_EXTRA_ARGC 0
 | 
						|
#endif
 | 
						|
	
 | 
						|
	
 | 
						|
	
 | 
						|
#define QTEST_GUILESS_MAIN_MULTIMC(TestObject) \
 | 
						|
int main(int argc, char *argv[]) \
 | 
						|
{ \
 | 
						|
	char *argv_[] = { argv[0] _MMC_EXTRA_ARGV }; \
 | 
						|
	int argc_ = 1 + _MMC_EXTRA_ARGC; \
 | 
						|
	MultiMC app(argc_, argv_, true); \
 | 
						|
	app.setAttribute(Qt::AA_Use96Dpi, true); \
 | 
						|
	TestObject tc; \
 | 
						|
	return QTest::qExec(&tc, argc, argv); \
 | 
						|
}
 |