adding an iOS build to travis (#1847)
* fixing compilation of tests that cannot build bracket code with the corresponding wxUSE… macros * adding directive for iOS * adding a switch for skipping the run - not the build of tests right now I don’t know yet, how to run the test binary in the iOS simulator, but building it is still a good test in itself * adding skipping of tests * increasing minimum deployment to get proper c++17 support * using --disable-sys-libs, restoring other targets even when the zlib in -isysroot is used, due to deployment on lower iOS versions inflateValidate may not be available and crash. The guards are evaluated using macros from the zlib from the SDK, not from the lowest version supported.
This commit is contained in:
@@ -462,7 +462,13 @@ void ArchiveTestCase<ClassFactoryT>::runTest()
|
||||
if (m_archiver.empty())
|
||||
CreateArchive(out);
|
||||
else
|
||||
{
|
||||
#ifndef __WXOSX_IPHONE__
|
||||
CreateArchive(out, m_archiver);
|
||||
#else
|
||||
CPPUNIT_FAIL("using external archivers is not supported on iOS");
|
||||
#endif
|
||||
}
|
||||
|
||||
// check archive could be created
|
||||
CPPUNIT_ASSERT(out.GetLength() > 0);
|
||||
@@ -489,7 +495,13 @@ void ArchiveTestCase<ClassFactoryT>::runTest()
|
||||
if (m_unarchiver.empty())
|
||||
ExtractArchive(in);
|
||||
else
|
||||
{
|
||||
#ifndef __WXOSX_IPHONE__
|
||||
ExtractArchive(in, m_unarchiver);
|
||||
#else
|
||||
CPPUNIT_FAIL("using external archivers is not supported on iOS");
|
||||
#endif
|
||||
}
|
||||
|
||||
// check that all the test entries were found in the archive
|
||||
CPPUNIT_ASSERT(m_testEntries.empty());
|
||||
@@ -620,6 +632,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out)
|
||||
|
||||
// Create an archive using an external archive program
|
||||
//
|
||||
#ifndef __WXOSX_IPHONE__
|
||||
template <class ClassFactoryT>
|
||||
void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
|
||||
const wxString& archiver)
|
||||
@@ -683,6 +696,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
|
||||
out.Write(in);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Do a standard set of modification on an archive, delete an entry,
|
||||
// rename an entry and add an entry
|
||||
@@ -864,6 +878,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
|
||||
|
||||
// Extract an archive using an external unarchive program
|
||||
//
|
||||
#ifndef __WXOSX_IPHONE__
|
||||
template <class ClassFactoryT>
|
||||
void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
|
||||
const wxString& unarchiver)
|
||||
@@ -905,6 +920,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
|
||||
wxString dir = tmpdir.GetName();
|
||||
VerifyDir(dir);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Verifies the files produced by an external unarchiver are as expected
|
||||
//
|
||||
|
Reference in New Issue
Block a user