napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Expand kpm test with API 3/4 differences

Browse Source 
- fix build
- KPMCore 3 distinguishes esp and boot
- KPMCore 4 does not
This commit is contained in:
Adriaan de Groot 2020-04-23 12:16:30 +02:00
parent 43c5e1fc96
commit 3f4e167aca
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamares/partition/KPMTests.cpp
View File

@ -57,11 +57,21 @@ KPMTests::testFlagNames()
f <<= 1;
}
#ifdef WITH_KPMCORE4API
// KPMCore 4 unifies the flags and handles them internally
QVERIFY( names.contains( QStringLiteral( "boot" ) ) );
QVERIFY( !names.contains( QStringLiteral( "esp" ) ) );
#else
// KPMCore 3 has separate flags
QVERIFY( names.contains( QStringLiteral( "boot" ) ) );
QVERIFY( names.contains( QStringLiteral( "esp" ) ) );
#endif
}
QTEST_GUILESS_MAIN( KPMTests )
#include "moc-warnings.h"
#include "utils/moc-warnings.h"
#include "KPMTests.moc"