[Lldb-commits] [PATCH] D74579: Creating environment variable test for lldbd
diazhector98 created this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D74579
Files:
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/TestVSCode_completions.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/Makefile
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/TestVSCode_environmentVariables.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/main.cpp
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
lldb/tools/lldb-vscode/lldb-vscode.cpp
Index: lldb/tools/lldb-vscode/lldb-vscode.cpp
===
--- lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -1402,10 +1402,11 @@
// if arguments has launchWithDebuggerEnvironment
// then append current environment to g_vsc.launch_info
if (launchWithDebuggerEnvironment) {
+ // if (true) {
char** env_var_pointer = environ;
std::vector vscode_env_variables;
-for (char* c = *env_var_pointer; c; c=*++env_var_pointer){
- vscode_env_variables.push_back(c);
+for (char* env_variable = *env_var_pointer; env_variable; env_variable=*++env_var_pointer){
+ vscode_env_variables.push_back(env_variable);
}
envs.insert(std::end(envs), std::begin(vscode_env_variables), std::end(vscode_env_variables));
}
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
===
--- lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
@@ -562,7 +562,7 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None, sourcePath=None,
- debuggerRoot=None, launchCommands=None):
+ debuggerRoot=None, launchCommands=None, inheritEnvironment=False):
args_dict = {
'program': program
}
@@ -597,6 +597,8 @@
args_dict['debuggerRoot'] = debuggerRoot
if launchCommands:
args_dict['launchCommands'] = launchCommands
+if inheritEnvironment:
+args_dict['inheritEnvironment'] = inheritEnvironment
command_dict = {
'command': 'launch',
'type': 'request',
@@ -891,6 +893,7 @@
stopCommands=options.stopCmds,
exitCommands=options.exitCmds)
else:
+print('Options.Envs: ', options.envs)
response = dbg.request_launch(options.program,
args=args,
env=options.envs,
@@ -929,6 +932,7 @@
def main():
+print("Hello This Is Main")
parser = optparse.OptionParser(
description=('A testing framework for the Visual Studio Code Debug '
'Adaptor protocol'))
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
===
--- lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
@@ -265,7 +265,7 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None,sourcePath= None,
- debuggerRoot=None, launchCommands=None):
+ debuggerRoot=None, launchCommands=None, inheritEnvironment=False):
'''Sending launch request to vscode
'''
@@ -296,7 +296,9 @@
exitCommands=exitCommands,
sourcePath=sourcePath,
debuggerRoot=debuggerRoot,
-launchCommands=launchCommands)
+launchCommands=launchCommands,
+inheritEnvironment=inheritEnvironment
+)
if not (response and response['success']):
self.assertTrue(response['success'],
'launch failed (%s)' % (response['message']))
@@ -306,14 +308,13 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None,
- sourcePath=None, debuggerRoot=None):
+ sourcePath=None, debuggerRoot=None, inheritEnvironment=False):
'''Build the default Makefile target, create the VSCode debug adaptor,
and launch
[Lldb-commits] [PATCH] D74579: Creating environment variable test for lldbd
diazhector98 updated this revision to Diff 244531.
diazhector98 added a comment.
Creating env tes
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74579/new/
https://reviews.llvm.org/D74579
Files:
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/TestVSCode_completions.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/Makefile
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/TestVSCode_environmentVariables.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/environmentVariables/main.cpp
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
lldb/tools/lldb-vscode/lldb-vscode.cpp
Index: lldb/tools/lldb-vscode/lldb-vscode.cpp
===
--- lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -1402,10 +1402,11 @@
// if arguments has launchWithDebuggerEnvironment
// then append current environment to g_vsc.launch_info
if (launchWithDebuggerEnvironment) {
+ // if (true) {
char** env_var_pointer = environ;
std::vector vscode_env_variables;
-for (char* c = *env_var_pointer; c; c=*++env_var_pointer){
- vscode_env_variables.push_back(c);
+for (char* env_variable = *env_var_pointer; env_variable; env_variable=*++env_var_pointer){
+ vscode_env_variables.push_back(env_variable);
}
envs.insert(std::end(envs), std::begin(vscode_env_variables), std::end(vscode_env_variables));
}
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
===
--- lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
@@ -562,7 +562,7 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None, sourcePath=None,
- debuggerRoot=None, launchCommands=None):
+ debuggerRoot=None, launchCommands=None, inheritEnvironment=False):
args_dict = {
'program': program
}
@@ -597,6 +597,8 @@
args_dict['debuggerRoot'] = debuggerRoot
if launchCommands:
args_dict['launchCommands'] = launchCommands
+if inheritEnvironment:
+args_dict['inheritEnvironment'] = inheritEnvironment
command_dict = {
'command': 'launch',
'type': 'request',
@@ -891,6 +893,7 @@
stopCommands=options.stopCmds,
exitCommands=options.exitCmds)
else:
+print('Options.Envs: ', options.envs)
response = dbg.request_launch(options.program,
args=args,
env=options.envs,
@@ -929,6 +932,7 @@
def main():
+print("Hello This Is Main")
parser = optparse.OptionParser(
description=('A testing framework for the Visual Studio Code Debug '
'Adaptor protocol'))
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
===
--- lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py
@@ -265,7 +265,7 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None,sourcePath= None,
- debuggerRoot=None, launchCommands=None):
+ debuggerRoot=None, launchCommands=None, inheritEnvironment=False):
'''Sending launch request to vscode
'''
@@ -296,7 +296,9 @@
exitCommands=exitCommands,
sourcePath=sourcePath,
debuggerRoot=debuggerRoot,
-launchCommands=launchCommands)
+launchCommands=launchCommands,
+inheritEnvironment=inheritEnvironment
+)
if not (response and response['success']):
self.assertTrue(response['success'],
'launch failed (%s)' % (response['message']))
@@ -306,14 +308,13 @@
disableSTDIO=False, shellExpandArguments=False,
trace=False, initCommands=None, preRunCommands=None,
stopCommands=None, exitCommands=None,
- sourcePath=None, debuggerRoot=None):
+ sourcePath=None, debuggerRoot=None, inheritEnvironment=False):
'''Build the default Makefile targ
