From 684fea0e245aaa0bb5769a7b818a20e2eae78b83 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 1 May 2020 13:27:07 -0700 Subject: Fix broken test. Test: pytest build ndk Bug: None Change-Id: I5050691608d17ad21a02099f4dd30fbc2f965522 --- ndk/test/test_spec.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ndk/test/test_spec.py b/ndk/test/test_spec.py index 348390f88..812a6abcf 100644 --- a/ndk/test/test_spec.py +++ b/ndk/test/test_spec.py @@ -16,22 +16,30 @@ import unittest import ndk.test.spec +from ndk.toolchains import LinkerOption class BuildConfigurationTest(unittest.TestCase): def test_from_string(self) -> None: - config = ndk.test.spec.BuildConfiguration.from_string('armeabi-v7a-16') + config = ndk.test.spec.BuildConfiguration.from_string( + 'armeabi-v7a-16-lld') self.assertEqual('armeabi-v7a', config.abi) self.assertEqual(16, config.api) + self.assertEqual(LinkerOption.Lld, config.linker) - config = ndk.test.spec.BuildConfiguration.from_string('arm64-v8a-21') + config = ndk.test.spec.BuildConfiguration.from_string( + 'arm64-v8a-21-default') self.assertEqual('arm64-v8a', config.abi) self.assertEqual(21, config.api) + self.assertEqual(LinkerOption.Default, config.linker) - config = ndk.test.spec.BuildConfiguration.from_string('x86-16') + config = ndk.test.spec.BuildConfiguration.from_string('x86-16-lld') self.assertEqual('x86', config.abi) self.assertEqual(16, config.api) + self.assertEqual(LinkerOption.Lld, config.linker) - config = ndk.test.spec.BuildConfiguration.from_string('x86_64-21') + config = ndk.test.spec.BuildConfiguration.from_string( + 'x86_64-21-default') self.assertEqual('x86_64', config.abi) self.assertEqual(21, config.api) + self.assertEqual(LinkerOption.Default, config.linker) -- cgit v1.2.3