diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lang/c')
20 files changed, 45 insertions, 44 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py index 539cb94caa5..08e77feea5b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class AnonymousTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py index ecfe0c26980..daeb8298e6d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class ArrayTypesTestCase(TestBase): @@ -102,7 +102,7 @@ class ArrayTypesTestCase(TestBase): # The stop reason of the thread should be breakpoint. thread = process.GetThreadAtIndex(0) if thread.GetStopReason() != lldb.eStopReasonBreakpoint: - from lldbutil import stop_reason_to_str + from lldbsuite.test.lldbutil import stop_reason_to_str self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS % stop_reason_to_str(thread.GetStopReason())) @@ -187,7 +187,7 @@ class ArrayTypesTestCase(TestBase): # Last, check that "long_6" has a value type of eValueTypeVariableLocal # and "argc" has eValueTypeVariableArgument. - from lldbutil import value_type_to_str + from lldbsuite.test.lldbutil import value_type_to_str self.assertTrue(variable.GetValueType() == lldb.eValueTypeVariableLocal, "Variable 'long_6' should have '%s' value type." % value_type_to_str(lldb.eValueTypeVariableLocal)) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py index b9ae8a51ae6..5c9e9a4c9f4 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class BitfieldsTestCase(TestBase): @@ -114,7 +114,7 @@ class BitfieldsTestCase(TestBase): # The stop reason of the thread should be breakpoint. thread = target.GetProcess().GetThreadAtIndex(0) if thread.GetStopReason() != lldb.eStopReasonBreakpoint: - from lldbutil import stop_reason_to_str + from lldbsuite.test.lldbutil import stop_reason_to_str self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS % stop_reason_to_str(thread.GetStopReason())) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py index fb32bf3e38d..c19b80a6291 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py @@ -7,8 +7,8 @@ import use_lldb_suite import unittest2 import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class BlocksTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py index f46d648064e..8d516062e69 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class ConstVariableTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py index 46355a978e6..5ed455020a6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class EnumTypesTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py index 05868597eec..ebcad21b3ad 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class ForwardDeclarationTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py index 85a97d4a298..480e0db4f5d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class FunctionTypesTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py index b75ef4fa38d..21ba39af774 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class GlobalVariablesTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py index 0453aa837b6..661e395d9dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py @@ -7,11 +7,11 @@ import use_lldb_suite import os, time import lldb import platform -import lldbutil +import lldbsuite.test.lldbutil as lldbutil from distutils.version import StrictVersion -from lldbtest import * +from lldbsuite.test.lldbtest import * class CModulesTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py index b20309395a9..ab102ca7613 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class RegisterVariableTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py index 276d9ef05ea..b9cc6530a29 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class SetValuesTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py index fedb1d62225..cd9151b4760 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py @@ -6,8 +6,8 @@ import use_lldb_suite import unittest2 import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class SharedLibTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py index 549db3a407f..43a55118e77 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py @@ -6,8 +6,8 @@ import use_lldb_suite import unittest2 import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class SharedLibStrippedTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py index 5048d014f60..78e73fe7d82 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -import lldbutil -from lldbtest import * +import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.lldbtest import * class TestCStepping(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py index fcc8428d5d7..e05efcc5fad 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py @@ -8,9 +8,10 @@ import use_lldb_suite import os, time import re -import lldb, lldbutil -from lldbtest import * -import lldbutil +import lldb +import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class ThreadSteppingTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py b/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py index f1d9be2149f..6f2a9ff03be 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py @@ -2,8 +2,8 @@ Tests that C strings work as expected in expressions """ import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class CStringsTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py index 0e3ec28955d..87ad326f318 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py @@ -1,4 +1,4 @@ -import lldbinline -import lldbtest +import lldbsuite.test.lldbinline as lldbinline +import lldbsuite.test.lldbtest as lldbtest lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.expectedFailureWindows("llvm.org/pr24764")] ) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py index 6236519a784..feb3a301b47 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py @@ -7,8 +7,8 @@ import use_lldb_suite import unittest2 import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class TlsGlobalTestCase(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py index f8f3393307a..9a73f851759 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -from lldbtest import * -import lldbutil +from lldbsuite.test.lldbtest import * +import lldbsuite.test.lldbutil as lldbutil class TypedefTestCase(TestBase): |
