[Lldb-commits] [lldb] fdea9a4 - [lldb] Remove license headers from all test source files

Raphael Isemann via lldb-commits lldb-commits at lists.llvm.org
Wed Feb 19 23:32:33 PST 2020


Author: Raphael Isemann
Date: 2020-02-20T08:32:01+01:00
New Revision: fdea9a4ec9b0d9585b8fe8a612686d9f44f40ddc

URL: https://github.com/llvm/llvm-project/commit/fdea9a4ec9b0d9585b8fe8a612686d9f44f40ddc
DIFF: https://github.com/llvm/llvm-project/commit/fdea9a4ec9b0d9585b8fe8a612686d9f44f40ddc.diff

LOG: [lldb] Remove license headers from all test source files

Summary:
Around a third of our test sources have LLVM license headers. This patch removes those headers from all test
sources and also fixes any tests that depended on the length of the license header.

The reasons for this are:

* A few tests verify line numbers and will start failing if the number of lines in the LLVM license header changes. Once I landed my patch for valid SourceLocations in debug info we will probably have even more tests that verify line numbers.
* No other LLVM project is putting license headers in its test files to my knowledge.
* They make the test sources much more verbose than they have to be. Several tests have longer license headers than the actual test source.

For the record, the following tests had their line numbers changed to pass with the removal of the license header:
    lldb-api :: functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
    lldb-shell :: Reproducer/TestGDBRemoteRepro.test
    lldb-shell :: Reproducer/TestMultipleTargets.test
    lldb-shell :: Reproducer/TestReuseDirectory.test
    lldb-shell :: ExecControl/StopHook/stop-hook-threads.test
    lldb-shell :: ExecControl/StopHook/stop-hook.test
    lldb-api :: lang/objc/exceptions/TestObjCExceptions.py

Reviewers: #lldb, espindola, JDevlieghere

Reviewed By: #lldb, JDevlieghere

Subscribers: emaste, aprantl, arphaman, JDevlieghere, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D74839

Added: 
    

Modified: 
    lldb/test/API/android/platform/main.cpp
    lldb/test/API/api/check_public_api_headers/main.cpp.template
    lldb/test/API/benchmarks/expression/main.cpp
    lldb/test/API/commands/add-dsym/uuid/main.cpp.template
    lldb/test/API/commands/apropos/with-process/main.cpp
    lldb/test/API/commands/command/nested_alias/main.cpp
    lldb/test/API/commands/command/script/main.cpp
    lldb/test/API/commands/disassemble/basic/main.cpp
    lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp
    lldb/test/API/commands/expression/persistent_types/main.c
    lldb/test/API/commands/expression/persistent_variables/main.c
    lldb/test/API/commands/expression/radar_8638051/main.c
    lldb/test/API/commands/expression/radar_9531204/main.c
    lldb/test/API/commands/expression/radar_9673664/main.c
    lldb/test/API/commands/expression/save_jit_objects/main.c
    lldb/test/API/commands/frame/recognizer/main.m
    lldb/test/API/commands/frame/var-scope/main.c
    lldb/test/API/commands/log/basic/main.cpp
    lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp
    lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
    lldb/test/API/commands/register/register/register_command/a.cpp
    lldb/test/API/commands/register/register/register_command/main.cpp
    lldb/test/API/commands/settings/main.cpp
    lldb/test/API/commands/target/basic/a.c
    lldb/test/API/commands/target/basic/b.c
    lldb/test/API/commands/target/basic/c.c
    lldb/test/API/commands/target/basic/globals.c
    lldb/test/API/commands/target/create-deps/a.cpp
    lldb/test/API/commands/target/create-deps/main.cpp
    lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp
    lldb/test/API/commands/watchpoints/hello_watchpoint/main.c
    lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c
    lldb/test/API/commands/watchpoints/multiple_hits/main.cpp
    lldb/test/API/commands/watchpoints/multiple_threads/main.cpp
    lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp
    lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp
    lldb/test/API/commands/watchpoints/watchpoint_commands/main.c
    lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c
    lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp
    lldb/test/API/commands/watchpoints/watchpoint_size/main.c
    lldb/test/API/functionalities/archives/a.c
    lldb/test/API/functionalities/archives/b.c
    lldb/test/API/functionalities/archives/main.c
    lldb/test/API/functionalities/asan/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
    lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp
    lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp
    lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c
    lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp
    lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp
    lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp
    lldb/test/API/functionalities/breakpoint/cpp/main.cpp
    lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
    lldb/test/API/functionalities/breakpoint/serialize/main.c
    lldb/test/API/functionalities/conditional_break/main.c
    lldb/test/API/functionalities/darwin_log/basic/main.c
    lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c
    lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c
    lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c
    lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c
    lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c
    lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c
    lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c
    lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c
    lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c
    lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c
    lldb/test/API/functionalities/darwin_log/format/main.c
    lldb/test/API/functionalities/darwin_log/source/debug/main.c
    lldb/test/API/functionalities/darwin_log/source/info/main.c
    lldb/test/API/functionalities/data-formatter/boolreference/main.mm
    lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
    lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m
    lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
    lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp
    lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp
    lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp
    lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp
    lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp
    lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m
    lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m
    lldb/test/API/functionalities/data-formatter/nssetsynth/main.m
    lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm
    lldb/test/API/functionalities/data-formatter/parray/main.cpp
    lldb/test/API/functionalities/data-formatter/poarray/main.mm
    lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp
    lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp
    lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m
    lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp
    lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp
    lldb/test/API/functionalities/data-formatter/synthupdate/main.m
    lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp
    lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp
    lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
    lldb/test/API/functionalities/data-formatter/vector-types/main.cpp
    lldb/test/API/functionalities/dead-strip/main.c
    lldb/test/API/functionalities/inferior-assert/main.c
    lldb/test/API/functionalities/inferior-changed/main.c
    lldb/test/API/functionalities/inferior-changed/main2.c
    lldb/test/API/functionalities/inferior-crashing/main.c
    lldb/test/API/functionalities/load_unload/a.cpp
    lldb/test/API/functionalities/load_unload/b.cpp
    lldb/test/API/functionalities/load_unload/c.cpp
    lldb/test/API/functionalities/load_unload/d.cpp
    lldb/test/API/functionalities/load_unload/hidden/d.cpp
    lldb/test/API/functionalities/load_unload/main.cpp
    lldb/test/API/functionalities/load_using_paths/hidden/d.cpp
    lldb/test/API/functionalities/load_using_paths/main.cpp
    lldb/test/API/functionalities/longjmp/main.c
    lldb/test/API/functionalities/memory/cache/main.cpp
    lldb/test/API/functionalities/memory/find/main.cpp
    lldb/test/API/functionalities/memory/read/main.cpp
    lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp
    lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template
    lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp
    lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp
    lldb/test/API/functionalities/ptr_refs/main.c
    lldb/test/API/functionalities/recursion/main.cpp
    lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp
    lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp
    lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp
    lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp
    lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp
    lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp
    lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp
    lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp
    lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp
    lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp
    lldb/test/API/functionalities/thread/break_after_join/main.cpp
    lldb/test/API/functionalities/thread/concurrent_events/main.cpp
    lldb/test/API/functionalities/thread/crash_during_step/main.cpp
    lldb/test/API/functionalities/thread/create_during_step/main.cpp
    lldb/test/API/functionalities/thread/exit_during_break/main.cpp
    lldb/test/API/functionalities/thread/exit_during_step/main.cpp
    lldb/test/API/functionalities/thread/jump/main.cpp
    lldb/test/API/functionalities/thread/jump/other.cpp
    lldb/test/API/functionalities/thread/multi_break/main.cpp
    lldb/test/API/functionalities/thread/state/main.cpp
    lldb/test/API/functionalities/thread/step_out/main.cpp
    lldb/test/API/functionalities/thread/thread_exit/main.cpp
    lldb/test/API/functionalities/tsan/basic/main.c
    lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp
    lldb/test/API/functionalities/tsan/global_location/main.c
    lldb/test/API/functionalities/tsan/multiple/main.m
    lldb/test/API/functionalities/tsan/thread_leak/main.c
    lldb/test/API/functionalities/tsan/thread_numbers/main.c
    lldb/test/API/functionalities/type_completion/main.cpp
    lldb/test/API/functionalities/type_lookup/main.mm
    lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp
    lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp
    lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp
    lldb/test/API/functionalities/value_md5_crash/main.cpp
    lldb/test/API/issue_verification/inline_rerun_inferior.cpp
    lldb/test/API/lang/c/array_types/main.c
    lldb/test/API/lang/c/bitfields/main.c
    lldb/test/API/lang/c/enum_types/main.c
    lldb/test/API/lang/c/function_types/main.c
    lldb/test/API/lang/c/global_variables/a.c
    lldb/test/API/lang/c/global_variables/main.c
    lldb/test/API/lang/c/set_values/main.c
    lldb/test/API/lang/c/stepping/main.c
    lldb/test/API/lang/c/strings/main.c
    lldb/test/API/lang/c/struct_types/main.c
    lldb/test/API/lang/c/tls_globals/a.c
    lldb/test/API/lang/c/tls_globals/main.c
    lldb/test/API/lang/c/typedef/main.c
    lldb/test/API/lang/cpp/auto/main.cpp
    lldb/test/API/lang/cpp/bool/main.cpp
    lldb/test/API/lang/cpp/char1632_t/main.cpp
    lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp
    lldb/test/API/lang/cpp/class_static/main.cpp
    lldb/test/API/lang/cpp/class_types/main.cpp
    lldb/test/API/lang/cpp/const_this/main.cpp
    lldb/test/API/lang/cpp/diamond/main.cpp
    lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp
    lldb/test/API/lang/cpp/enum_types/main.cpp
    lldb/test/API/lang/cpp/extern_c/main.cpp
    lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp
    lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp
    lldb/test/API/lang/cpp/global_variables/main.cpp
    lldb/test/API/lang/cpp/lambdas/main.cpp
    lldb/test/API/lang/cpp/llvm-style/main.cpp
    lldb/test/API/lang/cpp/namespace/main.cpp
    lldb/test/API/lang/cpp/namespace/ns.cpp
    lldb/test/API/lang/cpp/namespace/ns.h
    lldb/test/API/lang/cpp/namespace/ns2.cpp
    lldb/test/API/lang/cpp/namespace/ns3.cpp
    lldb/test/API/lang/cpp/namespace_conflicts/main.cpp
    lldb/test/API/lang/cpp/namespace_definitions/a.cpp
    lldb/test/API/lang/cpp/namespace_definitions/b.cpp
    lldb/test/API/lang/cpp/namespace_definitions/foo.h
    lldb/test/API/lang/cpp/namespace_definitions/main.cpp
    lldb/test/API/lang/cpp/printf/main.cpp
    lldb/test/API/lang/cpp/signed_types/main.cpp
    lldb/test/API/lang/cpp/static_members/main.cpp
    lldb/test/API/lang/cpp/static_methods/main.cpp
    lldb/test/API/lang/cpp/stl/main.cpp
    lldb/test/API/lang/cpp/symbols/main.cpp
    lldb/test/API/lang/cpp/template-function/main.cpp
    lldb/test/API/lang/cpp/template/main.cpp
    lldb/test/API/lang/cpp/this/main.cpp
    lldb/test/API/lang/cpp/type_lookup/main.cpp
    lldb/test/API/lang/cpp/unicode-literals/main.cpp
    lldb/test/API/lang/cpp/unique-types/main.cpp
    lldb/test/API/lang/cpp/unsigned_types/main.cpp
    lldb/test/API/lang/cpp/wchar_t/main.cpp
    lldb/test/API/lang/objc/bitfield_ivars/main.m
    lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
    lldb/test/API/lang/objc/exceptions/main.mm
    lldb/test/API/lang/objc/print-obj/blocked.m
    lldb/test/API/lang/objc/ptr_refs/main.m
    lldb/test/API/lang/objc/self/main.m
    lldb/test/API/lang/objc/variadic_methods/main.m
    lldb/test/API/linux/builtin_trap/main.cpp
    lldb/test/API/linux/thread/create_during_instruction_step/main.cpp
    lldb/test/API/macosx/duplicate-archive-members/a.c
    lldb/test/API/macosx/duplicate-archive-members/main.c
    lldb/test/API/macosx/duplicate-archive-members/sub1/a.c
    lldb/test/API/macosx/nslog/main.m
    lldb/test/API/macosx/order/main.c
    lldb/test/API/python_api/class_members/main.mm
    lldb/test/API/python_api/event/main.c
    lldb/test/API/python_api/exprpath_synthetic/main.mm
    lldb/test/API/python_api/frame/get-variables/main.c
    lldb/test/API/python_api/frame/main.c
    lldb/test/API/python_api/function_symbol/main.c
    lldb/test/API/python_api/lldbutil/frame/main.c
    lldb/test/API/python_api/lldbutil/iter/main.cpp
    lldb/test/API/python_api/lldbutil/process/main.cpp
    lldb/test/API/python_api/objc_type/main.m
    lldb/test/API/python_api/process/main.cpp
    lldb/test/API/python_api/sbdata/main.cpp
    lldb/test/API/python_api/sbtype_typeclass/main.m
    lldb/test/API/python_api/section/main.c
    lldb/test/API/python_api/signals/main.cpp
    lldb/test/API/python_api/symbol-context/main.c
    lldb/test/API/python_api/target/main.c
    lldb/test/API/python_api/thread/main.cpp
    lldb/test/API/python_api/thread/main2.cpp
    lldb/test/API/python_api/type/main.cpp
    lldb/test/API/python_api/value/empty_class/main.cpp
    lldb/test/API/python_api/value/linked_list/main.cpp
    lldb/test/API/python_api/value/main.c
    lldb/test/API/python_api/watchpoint/condition/main.cpp
    lldb/test/API/python_api/watchpoint/main.c
    lldb/test/API/python_api/watchpoint/watchlocation/main.cpp
    lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp
    lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
    lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
    lldb/test/API/tools/lldb-server/main.cpp
    lldb/test/API/tools/lldb-server/signal-filtering/main.cpp
    lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
    lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
    lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
    lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
    lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
    lldb/test/Shell/Reproducer/Inputs/GDBRemoteCrashCapture.in
    lldb/test/Shell/Reproducer/Inputs/MultipleTargetsCapture.in
    lldb/test/Shell/Reproducer/Inputs/simple.c
    lldb/test/Shell/Reproducer/TestMultipleTargets.test

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/android/platform/main.cpp b/lldb/test/API/android/platform/main.cpp
index e8f3fa65eb0d..c557e87e5df7 100644
--- a/lldb/test/API/android/platform/main.cpp
+++ b/lldb/test/API/android/platform/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main ()
 {
     return 0;

diff  --git a/lldb/test/API/api/check_public_api_headers/main.cpp.template b/lldb/test/API/api/check_public_api_headers/main.cpp.template
index 7fced85cd3aa..9274f33c75a2 100644
--- a/lldb/test/API/api/check_public_api_headers/main.cpp.template
+++ b/lldb/test/API/api/check_public_api_headers/main.cpp.template
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 %include_SB_APIs%
 

diff  --git a/lldb/test/API/benchmarks/expression/main.cpp b/lldb/test/API/benchmarks/expression/main.cpp
index 4083a6808658..1a095d350227 100644
--- a/lldb/test/API/benchmarks/expression/main.cpp
+++ b/lldb/test/API/benchmarks/expression/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 class Point {

diff  --git a/lldb/test/API/commands/add-dsym/uuid/main.cpp.template b/lldb/test/API/commands/add-dsym/uuid/main.cpp.template
index d486b3dd8b9b..db258e7292dd 100644
--- a/lldb/test/API/commands/add-dsym/uuid/main.cpp.template
+++ b/lldb/test/API/commands/add-dsym/uuid/main.cpp.template
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 int

diff  --git a/lldb/test/API/commands/apropos/with-process/main.cpp b/lldb/test/API/commands/apropos/with-process/main.cpp
index d18c86512bf3..0e0262694d0c 100644
--- a/lldb/test/API/commands/apropos/with-process/main.cpp
+++ b/lldb/test/API/commands/apropos/with-process/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/commands/command/nested_alias/main.cpp b/lldb/test/API/commands/command/nested_alias/main.cpp
index 4df7eed40a50..cea703b393c9 100644
--- a/lldb/test/API/commands/command/nested_alias/main.cpp
+++ b/lldb/test/API/commands/command/nested_alias/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/commands/command/script/main.cpp b/lldb/test/API/commands/command/script/main.cpp
index a0e9efd6ee0c..b953498b0d37 100644
--- a/lldb/test/API/commands/command/script/main.cpp
+++ b/lldb/test/API/commands/command/script/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdlib>
 #include <cstring>
 #include <string>

diff  --git a/lldb/test/API/commands/disassemble/basic/main.cpp b/lldb/test/API/commands/disassemble/basic/main.cpp
index 93d4b1cbd39c..cfa2498fc020 100644
--- a/lldb/test/API/commands/disassemble/basic/main.cpp
+++ b/lldb/test/API/commands/disassemble/basic/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int
 sum (int a, int b)
 {

diff  --git a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp
index 8e181aeba3b0..92512c3707cf 100644
--- a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp
+++ b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main()
 {
     int i;

diff  --git a/lldb/test/API/commands/expression/persistent_types/main.c b/lldb/test/API/commands/expression/persistent_types/main.c
index 9425c8b1cec7..4c4a716a2b19 100644
--- a/lldb/test/API/commands/expression/persistent_types/main.c
+++ b/lldb/test/API/commands/expression/persistent_types/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
 	const char* foo = "Hello world";

diff  --git a/lldb/test/API/commands/expression/persistent_variables/main.c b/lldb/test/API/commands/expression/persistent_variables/main.c
index 771bf4ad3422..970ee893510c 100644
--- a/lldb/test/API/commands/expression/persistent_variables/main.c
+++ b/lldb/test/API/commands/expression/persistent_variables/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
     int i = 5;

diff  --git a/lldb/test/API/commands/expression/radar_8638051/main.c b/lldb/test/API/commands/expression/radar_8638051/main.c
index dc528a458b36..dbfcefe802d2 100644
--- a/lldb/test/API/commands/expression/radar_8638051/main.c
+++ b/lldb/test/API/commands/expression/radar_8638051/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/commands/expression/radar_9531204/main.c b/lldb/test/API/commands/expression/radar_9531204/main.c
index 43200d317453..c02660b55641 100644
--- a/lldb/test/API/commands/expression/radar_9531204/main.c
+++ b/lldb/test/API/commands/expression/radar_9531204/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // breakpoint set -n foo

diff  --git a/lldb/test/API/commands/expression/radar_9673664/main.c b/lldb/test/API/commands/expression/radar_9673664/main.c
index c765cf2a83a7..f29faf0af1ff 100644
--- a/lldb/test/API/commands/expression/radar_9673664/main.c
+++ b/lldb/test/API/commands/expression/radar_9673664/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/commands/expression/save_jit_objects/main.c b/lldb/test/API/commands/expression/save_jit_objects/main.c
index c9775b6e9892..e7947e9b9dfd 100644
--- a/lldb/test/API/commands/expression/save_jit_objects/main.c
+++ b/lldb/test/API/commands/expression/save_jit_objects/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
 	const char* foo = "Hello world"; // break here

diff  --git a/lldb/test/API/commands/frame/recognizer/main.m b/lldb/test/API/commands/frame/recognizer/main.m
index 9c6ce9d21023..d903625369ec 100644
--- a/lldb/test/API/commands/frame/recognizer/main.m
+++ b/lldb/test/API/commands/frame/recognizer/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 void foo(int a, int b)

diff  --git a/lldb/test/API/commands/frame/var-scope/main.c b/lldb/test/API/commands/frame/var-scope/main.c
index 71f4cb234e32..86af937807ff 100644
--- a/lldb/test/API/commands/frame/var-scope/main.c
+++ b/lldb/test/API/commands/frame/var-scope/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int foo(int x, int y) {
     int z = 3 + x;
     return z + y; //% self.expect("frame variable -s", substrs=['ARG: (int) x = -3','ARG: (int) y = 0'])

diff  --git a/lldb/test/API/commands/log/basic/main.cpp b/lldb/test/API/commands/log/basic/main.cpp
index f5f1687695b8..c883ce82c92b 100644
--- a/lldb/test/API/commands/log/basic/main.cpp
+++ b/lldb/test/API/commands/log/basic/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdlib>
 #include <string>
 #include <fstream>

diff  --git a/lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp b/lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp
index 97b50585a525..7c1b5d50a9a6 100644
--- a/lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp
+++ b/lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-////
-//// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//// See https://llvm.org/LICENSE.txt for license information.
-//// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-////
-////===----------------------------------------------------------------------===//
 //
 
 #include <cpuid.h>

diff  --git a/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
index 3c5ef07e4b6d..b08977a3521e 100644
--- a/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
+++ b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-////
-//// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//// See https://llvm.org/LICENSE.txt for license information.
-//// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-////
-////===----------------------------------------------------------------------===//
 //
 
 #include <cstddef>

diff  --git a/lldb/test/API/commands/register/register/register_command/a.cpp b/lldb/test/API/commands/register/register/register_command/a.cpp
index 79f111aa2473..8e9e72746b3a 100644
--- a/lldb/test/API/commands/register/register/register_command/a.cpp
+++ b/lldb/test/API/commands/register/register/register_command/a.cpp
@@ -1,10 +1,3 @@
-//===-- a.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 long double

diff  --git a/lldb/test/API/commands/register/register/register_command/main.cpp b/lldb/test/API/commands/register/register/register_command/main.cpp
index 493a09e034da..860dfef0b3b9 100644
--- a/lldb/test/API/commands/register/register/register_command/main.cpp
+++ b/lldb/test/API/commands/register/register/register_command/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 #include <chrono>

diff  --git a/lldb/test/API/commands/settings/main.cpp b/lldb/test/API/commands/settings/main.cpp
index 5159eaa65b5a..e18f0ae52a9b 100644
--- a/lldb/test/API/commands/settings/main.cpp
+++ b/lldb/test/API/commands/settings/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdlib>
 #include <string>
 #include <fstream>

diff  --git a/lldb/test/API/commands/target/basic/a.c b/lldb/test/API/commands/target/basic/a.c
index b451d4ed703c..b8157275f1a9 100644
--- a/lldb/test/API/commands/target/basic/a.c
+++ b/lldb/test/API/commands/target/basic/a.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main(int argc, const char* argv[])
 {
     int *null_ptr = 0;

diff  --git a/lldb/test/API/commands/target/basic/b.c b/lldb/test/API/commands/target/basic/b.c
index bcc466c8f968..304208ed2288 100644
--- a/lldb/test/API/commands/target/basic/b.c
+++ b/lldb/test/API/commands/target/basic/b.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
     return 0; // Set break point at this line.

diff  --git a/lldb/test/API/commands/target/basic/c.c b/lldb/test/API/commands/target/basic/c.c
index a2cb5995aa59..8fdb850a7f8a 100644
--- a/lldb/test/API/commands/target/basic/c.c
+++ b/lldb/test/API/commands/target/basic/c.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/commands/target/basic/globals.c b/lldb/test/API/commands/target/basic/globals.c
index 421b34c0cbc2..85ae646ff841 100644
--- a/lldb/test/API/commands/target/basic/globals.c
+++ b/lldb/test/API/commands/target/basic/globals.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 char my_global_char = 'X';

diff  --git a/lldb/test/API/commands/target/create-deps/a.cpp b/lldb/test/API/commands/target/create-deps/a.cpp
index e80612bd5ccd..2aef7f0134e8 100644
--- a/lldb/test/API/commands/target/create-deps/a.cpp
+++ b/lldb/test/API/commands/target/create-deps/a.cpp
@@ -1,11 +1,3 @@
-//===-- b.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int a_function ()
 {
     return 500;

diff  --git a/lldb/test/API/commands/target/create-deps/main.cpp b/lldb/test/API/commands/target/create-deps/main.cpp
index 7ee1981a4c27..d3c554fa390d 100644
--- a/lldb/test/API/commands/target/create-deps/main.cpp
+++ b/lldb/test/API/commands/target/create-deps/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 extern int a_function ();
 extern int b_function ();
 

diff  --git a/lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp b/lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp
index ac8cf6be1660..02499efcfea3 100644
--- a/lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp
+++ b/lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <condition_variable>
 #include <cstdio>

diff  --git a/lldb/test/API/commands/watchpoints/hello_watchpoint/main.c b/lldb/test/API/commands/watchpoints/hello_watchpoint/main.c
index 173162dd3530..f007fb5a4f59 100644
--- a/lldb/test/API/commands/watchpoints/hello_watchpoint/main.c
+++ b/lldb/test/API/commands/watchpoints/hello_watchpoint/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c
index 76ad27a43145..25f52dfe7a10 100644
--- a/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c
+++ b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/commands/watchpoints/multiple_hits/main.cpp b/lldb/test/API/commands/watchpoints/multiple_hits/main.cpp
index f99c12597eee..c8ce8a018869 100644
--- a/lldb/test/API/commands/watchpoints/multiple_hits/main.cpp
+++ b/lldb/test/API/commands/watchpoints/multiple_hits/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 alignas(16) uint8_t buf[32];

diff  --git a/lldb/test/API/commands/watchpoints/multiple_threads/main.cpp b/lldb/test/API/commands/watchpoints/multiple_threads/main.cpp
index 1e6266d28770..50f6058f50d2 100644
--- a/lldb/test/API/commands/watchpoints/multiple_threads/main.cpp
+++ b/lldb/test/API/commands/watchpoints/multiple_threads/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "pseudo_barrier.h"
 #include <cstdio>
 #include <thread>

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp
index 43e4c1a7a347..7dfdd62d50bc 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp
index 3f7c5f5be966..f0d14f384041 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/main.c b/lldb/test/API/commands/watchpoints/watchpoint_commands/main.c
index a9d1cf28da0a..6a3036d3ce97 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/main.c
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c
index 04d8a06a3546..7bc7522a599f 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c
+++ b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 typedef signed char v4i8 __attribute__ ((vector_size(4)));
 v4i8 global_vector = {1, 2, 3, 4};
 

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp
index f21d2b33ff41..cca5690b9224 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp
+++ b/lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <condition_variable>
 #include <cstdio>

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_size/main.c b/lldb/test/API/commands/watchpoints/watchpoint_size/main.c
index 4edcf877e74c..216c5e042879 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_size/main.c
+++ b/lldb/test/API/commands/watchpoints/watchpoint_size/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/functionalities/archives/a.c b/lldb/test/API/functionalities/archives/a.c
index c8d226ab9de3..420e106d5bf5 100644
--- a/lldb/test/API/functionalities/archives/a.c
+++ b/lldb/test/API/functionalities/archives/a.c
@@ -1,10 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 int __a_global = 1;
 
 int a(int arg) {

diff  --git a/lldb/test/API/functionalities/archives/b.c b/lldb/test/API/functionalities/archives/b.c
index 6510b978f378..0352c85d0117 100644
--- a/lldb/test/API/functionalities/archives/b.c
+++ b/lldb/test/API/functionalities/archives/b.c
@@ -1,10 +1,3 @@
-//===-- b.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 static int __b_global = 2;
 
 int b(int arg) {

diff  --git a/lldb/test/API/functionalities/archives/main.c b/lldb/test/API/functionalities/archives/main.c
index 1525a1a5e389..b4a8a2e75f31 100644
--- a/lldb/test/API/functionalities/archives/main.c
+++ b/lldb/test/API/functionalities/archives/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 extern int a(int);

diff  --git a/lldb/test/API/functionalities/asan/main.c b/lldb/test/API/functionalities/asan/main.c
index 45f9f4f9fb79..85e7c5ec64ed 100644
--- a/lldb/test/API/functionalities/asan/main.c
+++ b/lldb/test/API/functionalities/asan/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdlib.h>
 

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
index 98fe4335cc2a..e21f1c4553f5 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
@@ -20,12 +20,12 @@ def testBreakpointByLineAndColumn(self):
         self.build()
         main_c = lldb.SBFileSpec("main.c")
         _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self,
-                                                              main_c, 19, 50)
+                                                              main_c, 11, 50)
         self.expect("fr v did_call", substrs='1')
         in_then = False
         for i in range(breakpoint.GetNumLocations()):
             b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 19)
+            self.assertEqual(b_loc.GetLine(), 11)
             in_then |= b_loc.GetColumn() == 50
         self.assertTrue(in_then)
 
@@ -34,11 +34,11 @@ def testBreakpointByLineAndColumn(self):
     def testBreakpointByLine(self):
         self.build()
         main_c = lldb.SBFileSpec("main.c")
-        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self, main_c, 19)
+        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self, main_c, 11)
         self.expect("fr v did_call", substrs='0')
         in_condition = False
         for i in range(breakpoint.GetNumLocations()):
             b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 19)
+            self.assertEqual(b_loc.GetLine(), 11)
             in_condition |= b_loc.GetColumn() < 30
         self.assertTrue(in_condition)

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
index f9adad305755..864a7f40f594 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int square(int x)
 {
   return x * x;

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c
index 8bebb9455a61..ceef28b26025 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
     // Add a body to the function, so we can set more than one

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c
index c830b17a3ce7..abe769cbea48 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp
index 9fc133f24006..c8916b51758d 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int a(int val)
 {
    return val; // Breakpoint Location 1

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp
index 3c98e147f221..2c70d81a2fef 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdlib>
 #include <string>
 #include <fstream>

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c
index b1ed4465c1d4..3f80f22fb2bb 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c
index b1ed4465c1d4..3f80f22fb2bb 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp
index 46682ec264dc..d1b6116b5b75 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <stdio.h>
 #include <thread>

diff  --git a/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp
index 13e5e3e891f9..304208ed2288 100644
--- a/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main (int argc, char const *argv[])
 {
     return 0; // Set break point at this line.

diff  --git a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp
index 94d0a0415d75..39bad55dad10 100644
--- a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int
 main(int argc, char const *argv[])
 {

diff  --git a/lldb/test/API/functionalities/breakpoint/cpp/main.cpp b/lldb/test/API/functionalities/breakpoint/cpp/main.cpp
index 4afabcbd36e1..f352084e7444 100644
--- a/lldb/test/API/functionalities/breakpoint/cpp/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/cpp/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
index 94a12c6241d9..baafd1277922 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <cstdio>
 #include <mutex>

diff  --git a/lldb/test/API/functionalities/breakpoint/serialize/main.c b/lldb/test/API/functionalities/breakpoint/serialize/main.c
index b1ed4465c1d4..3f80f22fb2bb 100644
--- a/lldb/test/API/functionalities/breakpoint/serialize/main.c
+++ b/lldb/test/API/functionalities/breakpoint/serialize/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/functionalities/conditional_break/main.c b/lldb/test/API/functionalities/conditional_break/main.c
index dc528a458b36..dbfcefe802d2 100644
--- a/lldb/test/API/functionalities/conditional_break/main.c
+++ b/lldb/test/API/functionalities/conditional_break/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to demonstrate the capability of the lldb command

diff  --git a/lldb/test/API/functionalities/darwin_log/basic/main.c b/lldb/test/API/functionalities/darwin_log/basic/main.c
index c69d0ab1c353..dedd49123cf2 100644
--- a/lldb/test/API/functionalities/darwin_log/basic/main.c
+++ b/lldb/test/API/functionalities/darwin_log/basic/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/log.h>
 #include <stdio.h>
 

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c
index b4b26c158d35..6fb9e9c402ae 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c
index b0b430187467..7474344076e4 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c
index fbe5106b5db0..7b16428b72f5 100644
--- a/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c
+++ b/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/format/main.c b/lldb/test/API/functionalities/darwin_log/format/main.c
index 889a4e978568..a29ecd16c9ba 100644
--- a/lldb/test/API/functionalities/darwin_log/format/main.c
+++ b/lldb/test/API/functionalities/darwin_log/format/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/activity.h>
 #include <os/log.h>
 #include <stdio.h>

diff  --git a/lldb/test/API/functionalities/darwin_log/source/debug/main.c b/lldb/test/API/functionalities/darwin_log/source/debug/main.c
index b3af8cb34767..5f841d8415e6 100644
--- a/lldb/test/API/functionalities/darwin_log/source/debug/main.c
+++ b/lldb/test/API/functionalities/darwin_log/source/debug/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/log.h>
 #include <stdio.h>
 

diff  --git a/lldb/test/API/functionalities/darwin_log/source/info/main.c b/lldb/test/API/functionalities/darwin_log/source/info/main.c
index 3472a9bc507e..fc6159f5075c 100644
--- a/lldb/test/API/functionalities/darwin_log/source/info/main.c
+++ b/lldb/test/API/functionalities/darwin_log/source/info/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <os/log.h>
 #include <stdio.h>
 

diff  --git a/lldb/test/API/functionalities/data-formatter/boolreference/main.mm b/lldb/test/API/functionalities/data-formatter/boolreference/main.mm
index e63aa32394ec..ce25c0b46e98 100644
--- a/lldb/test/API/functionalities/data-formatter/boolreference/main.mm
+++ b/lldb/test/API/functionalities/data-formatter/boolreference/main.mm
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp b/lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp
index f31d2a1a18ad..d50f5c73139d 100644
--- a/lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp
@@ -1,11 +1,3 @@
- //===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <Accelerate/Accelerate.h>
 
 int main()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp
index 6eabbb3ae0fc..ac13113da427 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp
index e0e7c7ab9bdb..197a9b6ae241 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
index c591313de881..b22a3d8c732a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp
index 0f922b313524..4e4baeda5ff8 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
index 62ff7b227774..3ff641363bfa 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m
index f32a347278bc..78bed5af3db9 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <CoreMedia/CoreMedia.h>
 
 int main(int argc, const char **argv)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m
index d0fa27570973..92a616f19121 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 #if defined(__APPLE__)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m
index e34cf5222994..08f4fd35c95e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main(int argc, const char **argv)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
index b0d926fd54ef..576e091db1bc 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 #if defined(__APPLE__)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m
index dc9e5609fbe4..bbf299e452e0 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
index 334369576a4f..be2f890bd6bb 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 bool bar(int const *foo) {
   return foo != 0; // Set break point at this line.
 }

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp
index db60981d88c0..98ea9ca6028f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp
index b9a517d8cebb..34bd5e2c0ef1 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp
index a73e8d778259..760d2384a772 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <atomic>
 
 // Define a Parent and Child struct that can point to each other.

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
index 9f0d3e431a30..c99a4b0b82bd 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
@@ -49,19 +49,19 @@ def test(self):
                     substrs=['stopped',
                              'stop reason = breakpoint'])
 
-        self.run_frame_var_check_cache_use("foo2_f", "Lambda in File main.cpp at Line 30")
+        self.run_frame_var_check_cache_use("foo2_f", "Lambda in File main.cpp at Line 22")
 
         lldbutil.continue_to_breakpoint(self.process(), bkpt)
 
-        self.run_frame_var_check_cache_use("add_num2_f", "Lambda in File main.cpp at Line 21")
+        self.run_frame_var_check_cache_use("add_num2_f", "Lambda in File main.cpp at Line 13")
 
         lldbutil.continue_to_breakpoint(self.process(), bkpt)
 
-        self.run_frame_var_check_cache_use("f2", "Lambda in File main.cpp at Line 43")
-        self.run_frame_var_check_cache_use("f3", "Lambda in File main.cpp at Line 47", True)
+        self.run_frame_var_check_cache_use("f2", "Lambda in File main.cpp at Line 35")
+        self.run_frame_var_check_cache_use("f3", "Lambda in File main.cpp at Line 39", True)
         # TODO reenable this case when std::function formatter supports
         # general callable object case.
-        #self.run_frame_var_check_cache_use("f4", "Function in File main.cpp at Line 16")
+        #self.run_frame_var_check_cache_use("f4", "Function in File main.cpp at Line 8")
 
         # These cases won't hit the cache at all but also don't require
         # an expensive lookup.

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp
index d0c931ddc8b4..ef7c97470652 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <functional>
 
 int foo(int x, int y) {

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
index 6e5fa43a6b9b..88fe273ae8e3 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <string>
 #include <vector>
 #include <initializer_list>

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp
index acb90323b6ce..77b101dbf383 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp b/lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp
index c59e9f0ee728..68e3a58ad601 100644
--- a/lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class Base {
 public:
   Base () = default;

diff  --git a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp
index a77f2c42e8dd..a60be8437823 100644
--- a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct Pair {
 	int x;
 	int y;

diff  --git a/lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp b/lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp
index fc4204b19848..5ae243a8dbdf 100644
--- a/lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 struct foo

diff  --git a/lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp b/lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp
index 86ee8d5a8e8c..aa7821fc2d40 100644
--- a/lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct S {
   int x;
   int y;

diff  --git a/lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m b/lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m
index e65ee6f0c85f..cdb612f67f09 100644
--- a/lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m
+++ b/lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m
index 65faaeaba097..ce61deed8277 100644
--- a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m
+++ b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/nssetsynth/main.m b/lldb/test/API/functionalities/data-formatter/nssetsynth/main.m
index 207e23f51f91..52f7dc5ebe49 100644
--- a/lldb/test/API/functionalities/data-formatter/nssetsynth/main.m
+++ b/lldb/test/API/functionalities/data-formatter/nssetsynth/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm b/lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm
index 18d37b70dfdc..a1613b2fe5b1 100644
--- a/lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm
+++ b/lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/parray/main.cpp b/lldb/test/API/functionalities/data-formatter/parray/main.cpp
index 5d52383819a0..63001eb3f963 100644
--- a/lldb/test/API/functionalities/data-formatter/parray/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/parray/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <functional>
 #include <stdlib.h>
 

diff  --git a/lldb/test/API/functionalities/data-formatter/poarray/main.mm b/lldb/test/API/functionalities/data-formatter/poarray/main.mm
index be822dd7ab02..74473b6b79bc 100644
--- a/lldb/test/API/functionalities/data-formatter/poarray/main.mm
+++ b/lldb/test/API/functionalities/data-formatter/poarray/main.mm
@@ -1,11 +1,3 @@
-//===-- main.cpp -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 struct ThreeObjects

diff  --git a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp
index 4520165758d5..131021065510 100644
--- a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 typedef int Foo;
 
 int main() {

diff  --git a/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp
index 4e7c633b5919..4c13aaccbd0f 100644
--- a/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct Foo
 {
   double x;

diff  --git a/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m b/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m
index e66c6b15e7f5..5f469ccb4922 100644
--- a/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m
+++ b/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m
@@ -1,10 +1,3 @@
-//===-- main.m ---------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #import <Foundation/Foundation.h>
 
 int main() {

diff  --git a/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp b/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp
index 2631171ebf89..670ed3db1748 100644
--- a/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <string>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp
index 9d483ebb4701..0f42f9d1c88e 100644
--- a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 struct contained

diff  --git a/lldb/test/API/functionalities/data-formatter/synthupdate/main.m b/lldb/test/API/functionalities/data-formatter/synthupdate/main.m
index eb27ff9d1e3c..8f2548720a8a 100644
--- a/lldb/test/API/functionalities/data-formatter/synthupdate/main.m
+++ b/lldb/test/API/functionalities/data-formatter/synthupdate/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 int main (int argc, const char * argv[])

diff  --git a/lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp b/lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp
index cb6dc18655f2..7e4323c9bb7c 100644
--- a/lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 typedef int Foo;
 
 int main() {

diff  --git a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp
index b7ac006eb68d..3bc8b6a6e114 100644
--- a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct Pair {
 	int x;
 	int y;

diff  --git a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
index e35f7f359e3b..897c027e16a6 100644
--- a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 struct Summarize
 {

diff  --git a/lldb/test/API/functionalities/data-formatter/vector-types/main.cpp b/lldb/test/API/functionalities/data-formatter/vector-types/main.cpp
index 5470147f08af..ef0a227560bc 100644
--- a/lldb/test/API/functionalities/data-formatter/vector-types/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/vector-types/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 typedef float float4 __attribute__((ext_vector_type(4)));
 typedef  unsigned char vec __attribute__((ext_vector_type(16)));
 

diff  --git a/lldb/test/API/functionalities/dead-strip/main.c b/lldb/test/API/functionalities/dead-strip/main.c
index cde8c18ba366..aa92522c432e 100644
--- a/lldb/test/API/functionalities/dead-strip/main.c
+++ b/lldb/test/API/functionalities/dead-strip/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 

diff  --git a/lldb/test/API/functionalities/inferior-assert/main.c b/lldb/test/API/functionalities/inferior-assert/main.c
index ad2ca5634240..45d3bc779c53 100644
--- a/lldb/test/API/functionalities/inferior-assert/main.c
+++ b/lldb/test/API/functionalities/inferior-assert/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <assert.h>
 

diff  --git a/lldb/test/API/functionalities/inferior-changed/main.c b/lldb/test/API/functionalities/inferior-changed/main.c
index ec4824ad4ad7..9ce587e41453 100644
--- a/lldb/test/API/functionalities/inferior-changed/main.c
+++ b/lldb/test/API/functionalities/inferior-changed/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main(int argc, const char* argv[])

diff  --git a/lldb/test/API/functionalities/inferior-changed/main2.c b/lldb/test/API/functionalities/inferior-changed/main2.c
index a3c68f0f03d9..d5a223d3aa6d 100644
--- a/lldb/test/API/functionalities/inferior-changed/main2.c
+++ b/lldb/test/API/functionalities/inferior-changed/main2.c
@@ -1,10 +1,3 @@
-//===-- main2.c -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdlib.h>
 

diff  --git a/lldb/test/API/functionalities/inferior-crashing/main.c b/lldb/test/API/functionalities/inferior-crashing/main.c
index 3423ea42bee8..aff7f302734c 100644
--- a/lldb/test/API/functionalities/inferior-crashing/main.c
+++ b/lldb/test/API/functionalities/inferior-crashing/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 const char *hello_world = "Hello, segfault!";

diff  --git a/lldb/test/API/functionalities/load_unload/a.cpp b/lldb/test/API/functionalities/load_unload/a.cpp
index ec34f9b974d1..497d6070a600 100644
--- a/lldb/test/API/functionalities/load_unload/a.cpp
+++ b/lldb/test/API/functionalities/load_unload/a.cpp
@@ -1,10 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 extern int b_function ();
 
 int a_init()

diff  --git a/lldb/test/API/functionalities/load_unload/b.cpp b/lldb/test/API/functionalities/load_unload/b.cpp
index 9db93841ab79..ed89d66e1eb8 100644
--- a/lldb/test/API/functionalities/load_unload/b.cpp
+++ b/lldb/test/API/functionalities/load_unload/b.cpp
@@ -1,11 +1,3 @@
-//===-- b.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int b_init()
 {
     return 345;

diff  --git a/lldb/test/API/functionalities/load_unload/c.cpp b/lldb/test/API/functionalities/load_unload/c.cpp
index cf0c146621e3..de23151c1516 100644
--- a/lldb/test/API/functionalities/load_unload/c.cpp
+++ b/lldb/test/API/functionalities/load_unload/c.cpp
@@ -1,10 +1,3 @@
-//===-- c.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 extern "C" int
 c_function ()
 {

diff  --git a/lldb/test/API/functionalities/load_unload/d.cpp b/lldb/test/API/functionalities/load_unload/d.cpp
index a2135c50713f..696b224e76ea 100644
--- a/lldb/test/API/functionalities/load_unload/d.cpp
+++ b/lldb/test/API/functionalities/load_unload/d.cpp
@@ -1,11 +1,3 @@
-//===-- c.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int d_init()
 {
     return 123;

diff  --git a/lldb/test/API/functionalities/load_unload/hidden/d.cpp b/lldb/test/API/functionalities/load_unload/hidden/d.cpp
index d03d3c9f8c7c..c4e15db46937 100644
--- a/lldb/test/API/functionalities/load_unload/hidden/d.cpp
+++ b/lldb/test/API/functionalities/load_unload/hidden/d.cpp
@@ -1,11 +1,3 @@
-//===-- c.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int d_init()
 {
     return 456;

diff  --git a/lldb/test/API/functionalities/load_unload/main.cpp b/lldb/test/API/functionalities/load_unload/main.cpp
index 815f030d8579..4aae9c30db35 100644
--- a/lldb/test/API/functionalities/load_unload/main.cpp
+++ b/lldb/test/API/functionalities/load_unload/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <dlfcn.h>
 #include <limits.h>

diff  --git a/lldb/test/API/functionalities/load_using_paths/hidden/d.cpp b/lldb/test/API/functionalities/load_using_paths/hidden/d.cpp
index d03d3c9f8c7c..c4e15db46937 100644
--- a/lldb/test/API/functionalities/load_using_paths/hidden/d.cpp
+++ b/lldb/test/API/functionalities/load_using_paths/hidden/d.cpp
@@ -1,11 +1,3 @@
-//===-- c.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int d_init()
 {
     return 456;

diff  --git a/lldb/test/API/functionalities/load_using_paths/main.cpp b/lldb/test/API/functionalities/load_using_paths/main.cpp
index 432774d36b53..d56d15dbabb3 100644
--- a/lldb/test/API/functionalities/load_using_paths/main.cpp
+++ b/lldb/test/API/functionalities/load_using_paths/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int

diff  --git a/lldb/test/API/functionalities/longjmp/main.c b/lldb/test/API/functionalities/longjmp/main.c
index ce1af7038c2e..d241dd022a88 100644
--- a/lldb/test/API/functionalities/longjmp/main.c
+++ b/lldb/test/API/functionalities/longjmp/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <setjmp.h>
 #include <stdio.h>
 #include <time.h>

diff  --git a/lldb/test/API/functionalities/memory/cache/main.cpp b/lldb/test/API/functionalities/memory/cache/main.cpp
index d47107cef878..44d85c5e9d2c 100644
--- a/lldb/test/API/functionalities/memory/cache/main.cpp
+++ b/lldb/test/API/functionalities/memory/cache/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main ()
 {
     int my_ints[] = {0x42};

diff  --git a/lldb/test/API/functionalities/memory/find/main.cpp b/lldb/test/API/functionalities/memory/find/main.cpp
index 5f4545daabd5..e3dcfc762ee0 100644
--- a/lldb/test/API/functionalities/memory/find/main.cpp
+++ b/lldb/test/API/functionalities/memory/find/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/functionalities/memory/read/main.cpp b/lldb/test/API/functionalities/memory/read/main.cpp
index 3c1ab5e3f334..5a33ac1343c2 100644
--- a/lldb/test/API/functionalities/memory/read/main.cpp
+++ b/lldb/test/API/functionalities/memory/read/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp b/lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp
index 2b8406a631b8..567b944f485b 100644
--- a/lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp
+++ b/lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class Point {
 public:
     int x;

diff  --git a/lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template b/lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template
index 1667c0d721ed..00383c3c20bf 100644
--- a/lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template
+++ b/lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template
@@ -1,11 +1,3 @@
-//===-- plugin.cpp -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 /*
 An example plugin for LLDB that provides a new foo command with a child subcommand
 Compile this into a dylib foo.dylib and load by placing in appropriate locations on disk or

diff  --git a/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp b/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp
index a8e5f34d14e7..3db1e4466763 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp
+++ b/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test verifies the correct handling of child thread exits.
 
 #include "pseudo_barrier.h"

diff  --git a/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp
index dd83558bd690..15d95983bb9f 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp
+++ b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test verifies the correct handling of child thread exits.
 
 #include "pseudo_barrier.h"

diff  --git a/lldb/test/API/functionalities/ptr_refs/main.c b/lldb/test/API/functionalities/ptr_refs/main.c
index f46862efd8b6..cfd1acffd5dc 100644
--- a/lldb/test/API/functionalities/ptr_refs/main.c
+++ b/lldb/test/API/functionalities/ptr_refs/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff  --git a/lldb/test/API/functionalities/recursion/main.cpp b/lldb/test/API/functionalities/recursion/main.cpp
index bd5278ace7dd..3bd09a9a8380 100644
--- a/lldb/test/API/functionalities/recursion/main.cpp
+++ b/lldb/test/API/functionalities/recursion/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp
index b59c063ade24..0f484b341df3 100644
--- a/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp
index 21c89199b9fc..944a27cc8cd1 100644
--- a/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp
index d4578c67a261..3a2811c9d052 100644
--- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp
index 6284ef40811d..7297a694d5ca 100644
--- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink2() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp
index 7816385dda06..b673e3487b5e 100644
--- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp
index a592d51169d4..5f035e773e11 100644
--- a/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) tail_call_sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp
index 5a2775b0deac..5cdb01293d40 100644
--- a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp
index df43bcc98eaa..8ec960523944 100644
--- a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp
index 4a647031ef15..71f1204d1a88 100644
--- a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp
index edfe59777c6c..c9ab74074f90 100644
--- a/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp
+++ b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 volatile int x;
 
 void __attribute__((noinline)) sink() {

diff  --git a/lldb/test/API/functionalities/thread/break_after_join/main.cpp b/lldb/test/API/functionalities/thread/break_after_join/main.cpp
index a589d979003b..58c771863ce0 100644
--- a/lldb/test/API/functionalities/thread/break_after_join/main.cpp
+++ b/lldb/test/API/functionalities/thread/break_after_join/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which one thread will exit
 // while a breakpoint is being handled in another thread.  This may not always
 // happen because it's possible that the exiting thread will exit before the

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/main.cpp b/lldb/test/API/functionalities/thread/concurrent_events/main.cpp
index 33ec8ad1f507..2e7cc3c8885f 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/main.cpp
+++ b/lldb/test/API/functionalities/thread/concurrent_events/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which multiple events
 // (breakpoints, watchpoints, crashes, and signal generation/delivery) happen
 // from multiple threads. The test expects the debugger to set a breakpoint on

diff  --git a/lldb/test/API/functionalities/thread/crash_during_step/main.cpp b/lldb/test/API/functionalities/thread/crash_during_step/main.cpp
index 34cccf4dc2a4..92aa2a96e61c 100644
--- a/lldb/test/API/functionalities/thread/crash_during_step/main.cpp
+++ b/lldb/test/API/functionalities/thread/crash_during_step/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 void (*crash)() = nullptr;
 
 int main()

diff  --git a/lldb/test/API/functionalities/thread/create_during_step/main.cpp b/lldb/test/API/functionalities/thread/create_during_step/main.cpp
index d09bdb0ddfc9..e3e39a2d1152 100644
--- a/lldb/test/API/functionalities/thread/create_during_step/main.cpp
+++ b/lldb/test/API/functionalities/thread/create_during_step/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which one thread will be
 // created while the debugger is stepping in another thread.
 

diff  --git a/lldb/test/API/functionalities/thread/exit_during_break/main.cpp b/lldb/test/API/functionalities/thread/exit_during_break/main.cpp
index ec28678c5d60..d342939ee32a 100644
--- a/lldb/test/API/functionalities/thread/exit_during_break/main.cpp
+++ b/lldb/test/API/functionalities/thread/exit_during_break/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which one thread will exit
 // while a breakpoint is being handled in another thread.  This may not always
 // happen because it's possible that the exiting thread will exit before the

diff  --git a/lldb/test/API/functionalities/thread/exit_during_step/main.cpp b/lldb/test/API/functionalities/thread/exit_during_step/main.cpp
index 0e2ae00576cb..31cd8df87e1e 100644
--- a/lldb/test/API/functionalities/thread/exit_during_step/main.cpp
+++ b/lldb/test/API/functionalities/thread/exit_during_step/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which one thread will exit
 // while the debugger is stepping in another thread.
 

diff  --git a/lldb/test/API/functionalities/thread/jump/main.cpp b/lldb/test/API/functionalities/thread/jump/main.cpp
index e0580bd25429..d3c0de2af4bf 100644
--- a/lldb/test/API/functionalities/thread/jump/main.cpp
+++ b/lldb/test/API/functionalities/thread/jump/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test verifies the correct handling of program counter jumps.
 
 int otherfn();

diff  --git a/lldb/test/API/functionalities/thread/jump/other.cpp b/lldb/test/API/functionalities/thread/jump/other.cpp
index 3ce9ad6548ba..741f13bbd522 100644
--- a/lldb/test/API/functionalities/thread/jump/other.cpp
+++ b/lldb/test/API/functionalities/thread/jump/other.cpp
@@ -1,11 +1,3 @@
-//===-- other.cpp -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int otherfn()
 {
     return 4; // other marker

diff  --git a/lldb/test/API/functionalities/thread/multi_break/main.cpp b/lldb/test/API/functionalities/thread/multi_break/main.cpp
index 5f884d758666..230aadc4ae2e 100644
--- a/lldb/test/API/functionalities/thread/multi_break/main.cpp
+++ b/lldb/test/API/functionalities/thread/multi_break/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which a breakpoint will be
 // hit in two threads at nearly the same moment.  The expected result is that
 // the breakpoint in the second thread will be hit while the breakpoint handler

diff  --git a/lldb/test/API/functionalities/thread/state/main.cpp b/lldb/test/API/functionalities/thread/state/main.cpp
index 63b50494bd0f..365c04333da1 100644
--- a/lldb/test/API/functionalities/thread/state/main.cpp
+++ b/lldb/test/API/functionalities/thread/state/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to verify that thread states are properly maintained
 // when transitional actions are performed in the debugger.  Most of the logic
 // is in the test script.  This program merely provides places where the test

diff  --git a/lldb/test/API/functionalities/thread/step_out/main.cpp b/lldb/test/API/functionalities/thread/step_out/main.cpp
index e7754d0ac745..76818fff925a 100644
--- a/lldb/test/API/functionalities/thread/step_out/main.cpp
+++ b/lldb/test/API/functionalities/thread/step_out/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test is intended to create a situation in which two threads are stopped
 // at a breakpoint and the debugger issues a step-out command.
 

diff  --git a/lldb/test/API/functionalities/thread/thread_exit/main.cpp b/lldb/test/API/functionalities/thread/thread_exit/main.cpp
index 7510dd3a7ff6..6c60a40bb66b 100644
--- a/lldb/test/API/functionalities/thread/thread_exit/main.cpp
+++ b/lldb/test/API/functionalities/thread/thread_exit/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This test verifies the correct handling of child thread exits.
 
 #include "pseudo_barrier.h"

diff  --git a/lldb/test/API/functionalities/tsan/basic/main.c b/lldb/test/API/functionalities/tsan/basic/main.c
index 108ae74d4aaa..a47806188697 100644
--- a/lldb/test/API/functionalities/tsan/basic/main.c
+++ b/lldb/test/API/functionalities/tsan/basic/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp b/lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp
index 04735ef86ff4..7c9fee297b30 100644
--- a/lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp
+++ b/lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/lldb/test/API/functionalities/tsan/global_location/main.c b/lldb/test/API/functionalities/tsan/global_location/main.c
index 4c88d9f0cc01..7c9fee297b30 100644
--- a/lldb/test/API/functionalities/tsan/global_location/main.c
+++ b/lldb/test/API/functionalities/tsan/global_location/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/lldb/test/API/functionalities/tsan/multiple/main.m b/lldb/test/API/functionalities/tsan/multiple/main.m
index d15bdaa33006..0e986c47b440 100644
--- a/lldb/test/API/functionalities/tsan/multiple/main.m
+++ b/lldb/test/API/functionalities/tsan/multiple/main.m
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 #import <pthread.h>
 

diff  --git a/lldb/test/API/functionalities/tsan/thread_leak/main.c b/lldb/test/API/functionalities/tsan/thread_leak/main.c
index 0c3a2cf84f5f..c773bec3f1c5 100644
--- a/lldb/test/API/functionalities/tsan/thread_leak/main.c
+++ b/lldb/test/API/functionalities/tsan/thread_leak/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/lldb/test/API/functionalities/tsan/thread_numbers/main.c b/lldb/test/API/functionalities/tsan/thread_numbers/main.c
index 5bc821314026..af0b7a267898 100644
--- a/lldb/test/API/functionalities/tsan/thread_numbers/main.c
+++ b/lldb/test/API/functionalities/tsan/thread_numbers/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/lldb/test/API/functionalities/type_completion/main.cpp b/lldb/test/API/functionalities/type_completion/main.cpp
index a361df0849ad..2154d5805c97 100644
--- a/lldb/test/API/functionalities/type_completion/main.cpp
+++ b/lldb/test/API/functionalities/type_completion/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <string.h>
 #include <vector>
 #include <iostream>

diff  --git a/lldb/test/API/functionalities/type_lookup/main.mm b/lldb/test/API/functionalities/type_lookup/main.mm
index 7b005a2086d0..663bd11f2a18 100644
--- a/lldb/test/API/functionalities/type_lookup/main.mm
+++ b/lldb/test/API/functionalities/type_lookup/main.mm
@@ -1,11 +1,3 @@
-//===-- main.mm -----------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 class MyCPPClass {

diff  --git a/lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp
index b2da92e992e6..154e215969c0 100644
--- a/lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp
+++ b/lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp
@@ -1,11 +1,3 @@
-//===-- divmod.cpp ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int
 main(int argc, char const *argv[])
 {

diff  --git a/lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp
index f8be1aa0d400..d2e34d8f6fba 100644
--- a/lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp
+++ b/lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdio>
 
 int

diff  --git a/lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp
index b609ea366dec..e54f60d46885 100644
--- a/lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp
+++ b/lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int
 main(int argc, char const *argv[])
 {

diff  --git a/lldb/test/API/functionalities/value_md5_crash/main.cpp b/lldb/test/API/functionalities/value_md5_crash/main.cpp
index b641049f2726..8c0ab58eaf6f 100644
--- a/lldb/test/API/functionalities/value_md5_crash/main.cpp
+++ b/lldb/test/API/functionalities/value_md5_crash/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class A {
 public:
     virtual int foo() { return 1; }

diff  --git a/lldb/test/API/issue_verification/inline_rerun_inferior.cpp b/lldb/test/API/issue_verification/inline_rerun_inferior.cpp
index 6d1e02360563..50a598551545 100644
--- a/lldb/test/API/issue_verification/inline_rerun_inferior.cpp
+++ b/lldb/test/API/issue_verification/inline_rerun_inferior.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 typedef int Foo;
 
 int main() {

diff  --git a/lldb/test/API/lang/c/array_types/main.c b/lldb/test/API/lang/c/array_types/main.c
index eda7dc3d6ac2..03a128dcb253 100644
--- a/lldb/test/API/lang/c/array_types/main.c
+++ b/lldb/test/API/lang/c/array_types/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 int main (int argc, char const *argv[])
 {
     struct point_tag {

diff  --git a/lldb/test/API/lang/c/bitfields/main.c b/lldb/test/API/lang/c/bitfields/main.c
index be3a1af76baf..15e68dd1d6ef 100644
--- a/lldb/test/API/lang/c/bitfields/main.c
+++ b/lldb/test/API/lang/c/bitfields/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

diff  --git a/lldb/test/API/lang/c/enum_types/main.c b/lldb/test/API/lang/c/enum_types/main.c
index 675af5ecec59..b866044e5e12 100644
--- a/lldb/test/API/lang/c/enum_types/main.c
+++ b/lldb/test/API/lang/c/enum_types/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 #include <stdio.h>

diff  --git a/lldb/test/API/lang/c/function_types/main.c b/lldb/test/API/lang/c/function_types/main.c
index f8710f67720f..7cdb232a275d 100644
--- a/lldb/test/API/lang/c/function_types/main.c
+++ b/lldb/test/API/lang/c/function_types/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int string_not_empty (const char *s)
 {
     if (s && s[0])

diff  --git a/lldb/test/API/lang/c/global_variables/a.c b/lldb/test/API/lang/c/global_variables/a.c
index ce3e6f9a2d40..4861b7116b05 100644
--- a/lldb/test/API/lang/c/global_variables/a.c
+++ b/lldb/test/API/lang/c/global_variables/a.c
@@ -1,10 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 int g_a = 123;
 struct Point {
     int x;

diff  --git a/lldb/test/API/lang/c/global_variables/main.c b/lldb/test/API/lang/c/global_variables/main.c
index caa715db3d57..864f094edd48 100644
--- a/lldb/test/API/lang/c/global_variables/main.c
+++ b/lldb/test/API/lang/c/global_variables/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int g_common_1; // Not initialized on purpose to cause it to be undefined external in .o file
 int g_file_global_int = 42;
 static const int g_file_static_int = 2;

diff  --git a/lldb/test/API/lang/c/set_values/main.c b/lldb/test/API/lang/c/set_values/main.c
index 64bc95fb5a82..64474c275a09 100644
--- a/lldb/test/API/lang/c/set_values/main.c
+++ b/lldb/test/API/lang/c/set_values/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 void set_char(void)

diff  --git a/lldb/test/API/lang/c/stepping/main.c b/lldb/test/API/lang/c/stepping/main.c
index 6dcb33350b05..43b5cfab183a 100644
--- a/lldb/test/API/lang/c/stepping/main.c
+++ b/lldb/test/API/lang/c/stepping/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int a(int);
 int b(int);
 int c(int);

diff  --git a/lldb/test/API/lang/c/strings/main.c b/lldb/test/API/lang/c/strings/main.c
index 4115520c95f4..08d6efd33405 100644
--- a/lldb/test/API/lang/c/strings/main.c
+++ b/lldb/test/API/lang/c/strings/main.c
@@ -1,11 +1,3 @@
-//===-- main.c ----------------------------------------------------*- C -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main()
 {
   const char a[] = "abcde";

diff  --git a/lldb/test/API/lang/c/struct_types/main.c b/lldb/test/API/lang/c/struct_types/main.c
index 356f139c0b23..0b87bb193032 100644
--- a/lldb/test/API/lang/c/struct_types/main.c
+++ b/lldb/test/API/lang/c/struct_types/main.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct things_to_sum {
     int a;
     int b;

diff  --git a/lldb/test/API/lang/c/tls_globals/a.c b/lldb/test/API/lang/c/tls_globals/a.c
index 00803964e612..f63108d8cceb 100644
--- a/lldb/test/API/lang/c/tls_globals/a.c
+++ b/lldb/test/API/lang/c/tls_globals/a.c
@@ -1,11 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <unistd.h>
 
 __thread int var_shared = 33;

diff  --git a/lldb/test/API/lang/c/tls_globals/main.c b/lldb/test/API/lang/c/tls_globals/main.c
index c9c1e681dc0e..bdfd78c1ac34 100644
--- a/lldb/test/API/lang/c/tls_globals/main.c
+++ b/lldb/test/API/lang/c/tls_globals/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>

diff  --git a/lldb/test/API/lang/c/typedef/main.c b/lldb/test/API/lang/c/typedef/main.c
index 467612e9b37b..ddfce61efad2 100644
--- a/lldb/test/API/lang/c/typedef/main.c
+++ b/lldb/test/API/lang/c/typedef/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 void test()
 {
     typedef double * a;

diff  --git a/lldb/test/API/lang/cpp/auto/main.cpp b/lldb/test/API/lang/cpp/auto/main.cpp
index 21dc61b928cd..3ead9e4957a6 100644
--- a/lldb/test/API/lang/cpp/auto/main.cpp
+++ b/lldb/test/API/lang/cpp/auto/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main()
 {
   long foo = 1234;

diff  --git a/lldb/test/API/lang/cpp/bool/main.cpp b/lldb/test/API/lang/cpp/bool/main.cpp
index a14cc690da78..c70a8cdef695 100644
--- a/lldb/test/API/lang/cpp/bool/main.cpp
+++ b/lldb/test/API/lang/cpp/bool/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 int main()

diff  --git a/lldb/test/API/lang/cpp/char1632_t/main.cpp b/lldb/test/API/lang/cpp/char1632_t/main.cpp
index 8cd0cfc77c5a..dc37df27fceb 100644
--- a/lldb/test/API/lang/cpp/char1632_t/main.cpp
+++ b/lldb/test/API/lang/cpp/char1632_t/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <assert.h>
 #include <string>
 

diff  --git a/lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp b/lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp
index 836a8301658a..82f09a1f268c 100644
--- a/lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp
+++ b/lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 template <class T, int... Args> struct C {
   T member;
   bool isSixteenThirtyTwo() { return false; }

diff  --git a/lldb/test/API/lang/cpp/class_static/main.cpp b/lldb/test/API/lang/cpp/class_static/main.cpp
index 319a05a7beec..e96443e865a8 100644
--- a/lldb/test/API/lang/cpp/class_static/main.cpp
+++ b/lldb/test/API/lang/cpp/class_static/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // I made this example after noting that I was unable to display an unsized
 // static class array. It turns out that gcc 4.2 will emit DWARF that correctly
 // describes the PointType, but it will incorrectly emit debug info for the

diff  --git a/lldb/test/API/lang/cpp/class_types/main.cpp b/lldb/test/API/lang/cpp/class_types/main.cpp
index 179f21777932..4eda69ba545a 100644
--- a/lldb/test/API/lang/cpp/class_types/main.cpp
+++ b/lldb/test/API/lang/cpp/class_types/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class Conversion
 {
 public:

diff  --git a/lldb/test/API/lang/cpp/const_this/main.cpp b/lldb/test/API/lang/cpp/const_this/main.cpp
index c244e1bf44e5..852007752861 100644
--- a/lldb/test/API/lang/cpp/const_this/main.cpp
+++ b/lldb/test/API/lang/cpp/const_this/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 class foo {

diff  --git a/lldb/test/API/lang/cpp/diamond/main.cpp b/lldb/test/API/lang/cpp/diamond/main.cpp
index 31329b271e2a..8f9714d33172 100644
--- a/lldb/test/API/lang/cpp/diamond/main.cpp
+++ b/lldb/test/API/lang/cpp/diamond/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 static int g_next_value = 12345;

diff  --git a/lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp b/lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp
index 9e03594a7346..8a95cf4d3903 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp
+++ b/lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp
@@ -1,10 +1,3 @@
-//===-- sbvalue-cast.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #ifdef DO_VIRTUAL_INHERITANCE
 #define VIRTUAL virtual
 #else

diff  --git a/lldb/test/API/lang/cpp/enum_types/main.cpp b/lldb/test/API/lang/cpp/enum_types/main.cpp
index e00fc2df4603..d7d428a24432 100644
--- a/lldb/test/API/lang/cpp/enum_types/main.cpp
+++ b/lldb/test/API/lang/cpp/enum_types/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/lang/cpp/extern_c/main.cpp b/lldb/test/API/lang/cpp/extern_c/main.cpp
index 47769014d493..727ea9255ca7 100644
--- a/lldb/test/API/lang/cpp/extern_c/main.cpp
+++ b/lldb/test/API/lang/cpp/extern_c/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp b/lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp
index 2489506b2803..7c0eac23600a 100644
--- a/lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp
+++ b/lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main() {
   union {
     int i;

diff  --git a/lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp b/lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp
index eea2830aef8d..407ba68be8a2 100644
--- a/lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp
+++ b/lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 template <class T> int staticSizeof() {
   return sizeof(T);
 }

diff  --git a/lldb/test/API/lang/cpp/global_variables/main.cpp b/lldb/test/API/lang/cpp/global_variables/main.cpp
index 0a164186e714..2228fe2cff82 100644
--- a/lldb/test/API/lang/cpp/global_variables/main.cpp
+++ b/lldb/test/API/lang/cpp/global_variables/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 namespace abc {

diff  --git a/lldb/test/API/lang/cpp/lambdas/main.cpp b/lldb/test/API/lang/cpp/lambdas/main.cpp
index 5870c877f4a9..b8f85f113f95 100644
--- a/lldb/test/API/lang/cpp/lambdas/main.cpp
+++ b/lldb/test/API/lang/cpp/lambdas/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/lang/cpp/llvm-style/main.cpp b/lldb/test/API/lang/cpp/llvm-style/main.cpp
index 048eeb2d27bb..6df5c9276985 100644
--- a/lldb/test/API/lang/cpp/llvm-style/main.cpp
+++ b/lldb/test/API/lang/cpp/llvm-style/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 namespace n {
     struct D {
         int i;

diff  --git a/lldb/test/API/lang/cpp/namespace/main.cpp b/lldb/test/API/lang/cpp/namespace/main.cpp
index 22c0309695c9..fc5dacdaf8f5 100644
--- a/lldb/test/API/lang/cpp/namespace/main.cpp
+++ b/lldb/test/API/lang/cpp/namespace/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdarg>
 #include <cstdlib>
 #include "ns.h"

diff  --git a/lldb/test/API/lang/cpp/namespace/ns.cpp b/lldb/test/API/lang/cpp/namespace/ns.cpp
index 481a9866fcb6..15e757569454 100644
--- a/lldb/test/API/lang/cpp/namespace/ns.cpp
+++ b/lldb/test/API/lang/cpp/namespace/ns.cpp
@@ -1,11 +1,3 @@
-//===-- ns.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "ns.h"
 
 int foo()

diff  --git a/lldb/test/API/lang/cpp/namespace/ns.h b/lldb/test/API/lang/cpp/namespace/ns.h
index d04b45a7d7ab..d189751c278c 100644
--- a/lldb/test/API/lang/cpp/namespace/ns.h
+++ b/lldb/test/API/lang/cpp/namespace/ns.h
@@ -1,11 +1,3 @@
-//===-- ns.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstdio>
 
 void test_lookup_at_global_scope();

diff  --git a/lldb/test/API/lang/cpp/namespace/ns2.cpp b/lldb/test/API/lang/cpp/namespace/ns2.cpp
index 9aae5d0a495c..78c9a7c78086 100644
--- a/lldb/test/API/lang/cpp/namespace/ns2.cpp
+++ b/lldb/test/API/lang/cpp/namespace/ns2.cpp
@@ -1,11 +1,3 @@
-//===-- ns2.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "ns.h"
 
 static int func()

diff  --git a/lldb/test/API/lang/cpp/namespace/ns3.cpp b/lldb/test/API/lang/cpp/namespace/ns3.cpp
index 0f7a5050fde4..c6e7580b8051 100644
--- a/lldb/test/API/lang/cpp/namespace/ns3.cpp
+++ b/lldb/test/API/lang/cpp/namespace/ns3.cpp
@@ -1,11 +1,3 @@
-//===-- ns3.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "ns.h"
 extern int func();
 

diff  --git a/lldb/test/API/lang/cpp/namespace_conflicts/main.cpp b/lldb/test/API/lang/cpp/namespace_conflicts/main.cpp
index 0349365d8432..525b45d37ef5 100644
--- a/lldb/test/API/lang/cpp/namespace_conflicts/main.cpp
+++ b/lldb/test/API/lang/cpp/namespace_conflicts/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 namespace n {
     struct D {
         int i;

diff  --git a/lldb/test/API/lang/cpp/namespace_definitions/a.cpp b/lldb/test/API/lang/cpp/namespace_definitions/a.cpp
index 2795b206e8e7..37badf998bb6 100644
--- a/lldb/test/API/lang/cpp/namespace_definitions/a.cpp
+++ b/lldb/test/API/lang/cpp/namespace_definitions/a.cpp
@@ -1,11 +1,3 @@
-//===-- a.cpp ---------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "foo.h"
 
 class ThingInside {

diff  --git a/lldb/test/API/lang/cpp/namespace_definitions/b.cpp b/lldb/test/API/lang/cpp/namespace_definitions/b.cpp
index b676865c4d2a..08ab6b780392 100644
--- a/lldb/test/API/lang/cpp/namespace_definitions/b.cpp
+++ b/lldb/test/API/lang/cpp/namespace_definitions/b.cpp
@@ -1,11 +1,3 @@
-//===-- b.cpp ---------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include "foo.h"
 
 Foo::MyClass b_class;

diff  --git a/lldb/test/API/lang/cpp/namespace_definitions/foo.h b/lldb/test/API/lang/cpp/namespace_definitions/foo.h
index a2c64ab59289..231a5bb5de86 100644
--- a/lldb/test/API/lang/cpp/namespace_definitions/foo.h
+++ b/lldb/test/API/lang/cpp/namespace_definitions/foo.h
@@ -1,11 +1,3 @@
-//===-- foo.h ---------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class ThingInside;
 
 namespace Foo {

diff  --git a/lldb/test/API/lang/cpp/namespace_definitions/main.cpp b/lldb/test/API/lang/cpp/namespace_definitions/main.cpp
index 8703cd99246a..e5ffd00d5503 100644
--- a/lldb/test/API/lang/cpp/namespace_definitions/main.cpp
+++ b/lldb/test/API/lang/cpp/namespace_definitions/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 int

diff  --git a/lldb/test/API/lang/cpp/printf/main.cpp b/lldb/test/API/lang/cpp/printf/main.cpp
index 27395eb6f41d..483a582278c3 100644
--- a/lldb/test/API/lang/cpp/printf/main.cpp
+++ b/lldb/test/API/lang/cpp/printf/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class PrintfContainer {
 public:
     int printf() {

diff  --git a/lldb/test/API/lang/cpp/signed_types/main.cpp b/lldb/test/API/lang/cpp/signed_types/main.cpp
index 4f180bbbd136..a0f8f3f374f2 100644
--- a/lldb/test/API/lang/cpp/signed_types/main.cpp
+++ b/lldb/test/API/lang/cpp/signed_types/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int main (int argc, char const *argv[])

diff  --git a/lldb/test/API/lang/cpp/static_members/main.cpp b/lldb/test/API/lang/cpp/static_members/main.cpp
index 6fa6774e0314..1503ec6e0ebf 100644
--- a/lldb/test/API/lang/cpp/static_members/main.cpp
+++ b/lldb/test/API/lang/cpp/static_members/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 struct A
 {
     short m_a;

diff  --git a/lldb/test/API/lang/cpp/static_methods/main.cpp b/lldb/test/API/lang/cpp/static_methods/main.cpp
index 4c57e09296c9..de1c2ff3e119 100644
--- a/lldb/test/API/lang/cpp/static_methods/main.cpp
+++ b/lldb/test/API/lang/cpp/static_methods/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 class A

diff  --git a/lldb/test/API/lang/cpp/stl/main.cpp b/lldb/test/API/lang/cpp/stl/main.cpp
index 89895196b15d..1d0a7fc045f0 100644
--- a/lldb/test/API/lang/cpp/stl/main.cpp
+++ b/lldb/test/API/lang/cpp/stl/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <cstdio>
 #include <iostream>
 #include <string>

diff  --git a/lldb/test/API/lang/cpp/symbols/main.cpp b/lldb/test/API/lang/cpp/symbols/main.cpp
index cbd3ab253d6a..81f00980e821 100644
--- a/lldb/test/API/lang/cpp/symbols/main.cpp
+++ b/lldb/test/API/lang/cpp/symbols/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 void *D = 0;
 
 class D {

diff  --git a/lldb/test/API/lang/cpp/template-function/main.cpp b/lldb/test/API/lang/cpp/template-function/main.cpp
index 035e6450cd3e..c0fbc5cee668 100644
--- a/lldb/test/API/lang/cpp/template-function/main.cpp
+++ b/lldb/test/API/lang/cpp/template-function/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 template<typename T>
 int foo(T t1) {
         return int(t1);

diff  --git a/lldb/test/API/lang/cpp/template/main.cpp b/lldb/test/API/lang/cpp/template/main.cpp
index 445a34fe0676..f58cd30f371c 100644
--- a/lldb/test/API/lang/cpp/template/main.cpp
+++ b/lldb/test/API/lang/cpp/template/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <tuple>
 
 template <int Arg>

diff  --git a/lldb/test/API/lang/cpp/this/main.cpp b/lldb/test/API/lang/cpp/this/main.cpp
index 4026de0222fc..d7bcd77ed171 100644
--- a/lldb/test/API/lang/cpp/this/main.cpp
+++ b/lldb/test/API/lang/cpp/this/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 template <class T> class A

diff  --git a/lldb/test/API/lang/cpp/type_lookup/main.cpp b/lldb/test/API/lang/cpp/type_lookup/main.cpp
index f2803e361525..d31720a25c39 100644
--- a/lldb/test/API/lang/cpp/type_lookup/main.cpp
+++ b/lldb/test/API/lang/cpp/type_lookup/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // In this test, we define struct that exist might exist at the 
diff erent
 // levels in the code and test that we can properly locate these types with
 // a varienty of 
diff erent expressions.

diff  --git a/lldb/test/API/lang/cpp/unicode-literals/main.cpp b/lldb/test/API/lang/cpp/unicode-literals/main.cpp
index a98fb44e5f48..b6206c359581 100644
--- a/lldb/test/API/lang/cpp/unicode-literals/main.cpp
+++ b/lldb/test/API/lang/cpp/unicode-literals/main.cpp
@@ -1,12 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-
 int main (int argc, char const *argv[])
 {
     auto cs16 = u"hello world ྒྙྐ";

diff  --git a/lldb/test/API/lang/cpp/unique-types/main.cpp b/lldb/test/API/lang/cpp/unique-types/main.cpp
index 839fd93f764c..e419cf01a845 100644
--- a/lldb/test/API/lang/cpp/unique-types/main.cpp
+++ b/lldb/test/API/lang/cpp/unique-types/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <vector>
 
 #include <stdio.h>

diff  --git a/lldb/test/API/lang/cpp/unsigned_types/main.cpp b/lldb/test/API/lang/cpp/unsigned_types/main.cpp
index 8d0a0c386e31..921968650c66 100644
--- a/lldb/test/API/lang/cpp/unsigned_types/main.cpp
+++ b/lldb/test/API/lang/cpp/unsigned_types/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 int main (int argc, char const *argv[])
 {
     typedef unsigned int uint32_t;

diff  --git a/lldb/test/API/lang/cpp/wchar_t/main.cpp b/lldb/test/API/lang/cpp/wchar_t/main.cpp
index 420fe0c56697..778642e0133f 100644
--- a/lldb/test/API/lang/cpp/wchar_t/main.cpp
+++ b/lldb/test/API/lang/cpp/wchar_t/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <cstring>
 
 template <typename T>

diff  --git a/lldb/test/API/lang/objc/bitfield_ivars/main.m b/lldb/test/API/lang/objc/bitfield_ivars/main.m
index e19f291ecf98..1ba1cf004abf 100644
--- a/lldb/test/API/lang/objc/bitfield_ivars/main.m
+++ b/lldb/test/API/lang/objc/bitfield_ivars/main.m
@@ -1,11 +1,3 @@
-//===-- main.m -------------------------------------------*- Objective-C-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 @interface HasBitfield : NSObject {

diff  --git a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
index f7d18e626e01..19eea0ff79a5 100644
--- a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
+++ b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
@@ -142,8 +142,8 @@ def test_objc_exceptions_at_abort(self):
                 '(NSException *) exception = ',
                 '"SomeReason"',
                 'libobjc.A.dylib`objc_exception_throw',
-                'a.out`foo', 'at main.mm:24',
-                'a.out`rethrow', 'at main.mm:35',
+                'a.out`foo', 'at main.mm:16',
+                'a.out`rethrow', 'at main.mm:27',
                 'a.out`main',
             ])
 
@@ -169,8 +169,8 @@ def test_objc_exceptions_at_abort(self):
         self.expect('thread exception', substrs=[
                 '(MyCustomException *) exception = ',
                 'libobjc.A.dylib`objc_exception_throw',
-                'a.out`foo', 'at main.mm:26',
-                'a.out`rethrow', 'at main.mm:35',
+                'a.out`foo', 'at main.mm:18',
+                'a.out`rethrow', 'at main.mm:27',
                 'a.out`main',
             ])
 

diff  --git a/lldb/test/API/lang/objc/exceptions/main.mm b/lldb/test/API/lang/objc/exceptions/main.mm
index b5c71f9fcf9f..4f1cb0342288 100644
--- a/lldb/test/API/lang/objc/exceptions/main.mm
+++ b/lldb/test/API/lang/objc/exceptions/main.mm
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 #import <exception>

diff  --git a/lldb/test/API/lang/objc/print-obj/blocked.m b/lldb/test/API/lang/objc/print-obj/blocked.m
index 587712640620..84130086fc05 100644
--- a/lldb/test/API/lang/objc/print-obj/blocked.m
+++ b/lldb/test/API/lang/objc/print-obj/blocked.m
@@ -1,11 +1,3 @@
-//===-- blocked.m --------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This file is for testing running "print object" in a case where another thread
 // blocks the print object from making progress.  Set a breakpoint on the line in 
 // my_pthread_routine as indicated.  Then switch threads to the main thread, and

diff  --git a/lldb/test/API/lang/objc/ptr_refs/main.m b/lldb/test/API/lang/objc/ptr_refs/main.m
index 94bf0fb9fc55..cebb64309177 100644
--- a/lldb/test/API/lang/objc/ptr_refs/main.m
+++ b/lldb/test/API/lang/objc/ptr_refs/main.m
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 @interface MyClass : NSObject {

diff  --git a/lldb/test/API/lang/objc/self/main.m b/lldb/test/API/lang/objc/self/main.m
index 8f4e61202a35..5ec1d65d16ce 100644
--- a/lldb/test/API/lang/objc/self/main.m
+++ b/lldb/test/API/lang/objc/self/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------*- Objective-C -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 @interface A : NSObject

diff  --git a/lldb/test/API/lang/objc/variadic_methods/main.m b/lldb/test/API/lang/objc/variadic_methods/main.m
index 609d783dd595..205a1e0e0340 100644
--- a/lldb/test/API/lang/objc/variadic_methods/main.m
+++ b/lldb/test/API/lang/objc/variadic_methods/main.m
@@ -1,11 +1,3 @@
-//===-- main.m -------------------------------------------*- Objective-C-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 @interface VarClass : NSObject

diff  --git a/lldb/test/API/linux/builtin_trap/main.cpp b/lldb/test/API/linux/builtin_trap/main.cpp
index f005e697c8ee..0ddf865ad097 100644
--- a/lldb/test/API/linux/builtin_trap/main.cpp
+++ b/lldb/test/API/linux/builtin_trap/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 void bar(int const *foo) {
   __builtin_trap(); // Set break point at this line.
 }

diff  --git a/lldb/test/API/linux/thread/create_during_instruction_step/main.cpp b/lldb/test/API/linux/thread/create_during_instruction_step/main.cpp
index 4488f2310d52..3372cc5309c4 100644
--- a/lldb/test/API/linux/thread/create_during_instruction_step/main.cpp
+++ b/lldb/test/API/linux/thread/create_during_instruction_step/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // This file deliberately uses low level linux-specific API for thread creation because:
 // - instruction-stepping over thread creation using higher-level functions was very slow
 // - it was also unreliable due to single-stepping bugs unrelated to this test

diff  --git a/lldb/test/API/macosx/duplicate-archive-members/a.c b/lldb/test/API/macosx/duplicate-archive-members/a.c
index 4d57868c3205..058ade362a32 100644
--- a/lldb/test/API/macosx/duplicate-archive-members/a.c
+++ b/lldb/test/API/macosx/duplicate-archive-members/a.c
@@ -1,10 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 int __a_global = 1;
 
 int a(int arg) {

diff  --git a/lldb/test/API/macosx/duplicate-archive-members/main.c b/lldb/test/API/macosx/duplicate-archive-members/main.c
index 1525a1a5e389..b4a8a2e75f31 100644
--- a/lldb/test/API/macosx/duplicate-archive-members/main.c
+++ b/lldb/test/API/macosx/duplicate-archive-members/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 extern int a(int);

diff  --git a/lldb/test/API/macosx/duplicate-archive-members/sub1/a.c b/lldb/test/API/macosx/duplicate-archive-members/sub1/a.c
index e90218c9676c..1b9033ff2820 100644
--- a/lldb/test/API/macosx/duplicate-archive-members/sub1/a.c
+++ b/lldb/test/API/macosx/duplicate-archive-members/sub1/a.c
@@ -1,10 +1,3 @@
-//===-- a.c -----------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 static int __b_global = 2;
 
 int b(int arg) {

diff  --git a/lldb/test/API/macosx/nslog/main.m b/lldb/test/API/macosx/nslog/main.m
index d48536496b88..d806a8d66f81 100644
--- a/lldb/test/API/macosx/nslog/main.m
+++ b/lldb/test/API/macosx/nslog/main.m
@@ -1,11 +1,3 @@
-//===-- main.m --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <Foundation/Foundation.h>
 
 int main(int argc, char** argv)

diff  --git a/lldb/test/API/macosx/order/main.c b/lldb/test/API/macosx/order/main.c
index 18ee77685c94..6c5a02f379cc 100644
--- a/lldb/test/API/macosx/order/main.c
+++ b/lldb/test/API/macosx/order/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 

diff  --git a/lldb/test/API/python_api/class_members/main.mm b/lldb/test/API/python_api/class_members/main.mm
index 48a2c59ad4a9..b84f4d3d4b4f 100644
--- a/lldb/test/API/python_api/class_members/main.mm
+++ b/lldb/test/API/python_api/class_members/main.mm
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 class Base {

diff  --git a/lldb/test/API/python_api/event/main.c b/lldb/test/API/python_api/event/main.c
index 57369520dd16..f6dbff4be4da 100644
--- a/lldb/test/API/python_api/event/main.c
+++ b/lldb/test/API/python_api/event/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python API related to events.

diff  --git a/lldb/test/API/python_api/exprpath_synthetic/main.mm b/lldb/test/API/python_api/exprpath_synthetic/main.mm
index 365fe12dd60e..21db5e7cb28c 100644
--- a/lldb/test/API/python_api/exprpath_synthetic/main.mm
+++ b/lldb/test/API/python_api/exprpath_synthetic/main.mm
@@ -1,10 +1,3 @@
-//===-- main.mm --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #import <Foundation/Foundation.h>
 #include <vector>
 

diff  --git a/lldb/test/API/python_api/frame/get-variables/main.c b/lldb/test/API/python_api/frame/get-variables/main.c
index 7606e2ac9090..5f6bd7de7819 100644
--- a/lldb/test/API/python_api/frame/get-variables/main.c
+++ b/lldb/test/API/python_api/frame/get-variables/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int g_global_var = 123;

diff  --git a/lldb/test/API/python_api/frame/main.c b/lldb/test/API/python_api/frame/main.c
index 75f4448758b9..eb2b1a26d561 100644
--- a/lldb/test/API/python_api/frame/main.c
+++ b/lldb/test/API/python_api/frame/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python API related to frames.

diff  --git a/lldb/test/API/python_api/function_symbol/main.c b/lldb/test/API/python_api/function_symbol/main.c
index 33eea200bc47..7dc18d231ddf 100644
--- a/lldb/test/API/python_api/function_symbol/main.c
+++ b/lldb/test/API/python_api/function_symbol/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python APIs SBTarget, SBFrame,

diff  --git a/lldb/test/API/python_api/lldbutil/frame/main.c b/lldb/test/API/python_api/lldbutil/frame/main.c
index f83709616e58..6244a38a5c57 100644
--- a/lldb/test/API/python_api/lldbutil/frame/main.c
+++ b/lldb/test/API/python_api/lldbutil/frame/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 int a(int);

diff  --git a/lldb/test/API/python_api/lldbutil/iter/main.cpp b/lldb/test/API/python_api/lldbutil/iter/main.cpp
index 6823ccc4eb8f..38658e3d287a 100644
--- a/lldb/test/API/python_api/lldbutil/iter/main.cpp
+++ b/lldb/test/API/python_api/lldbutil/iter/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 // C includes
 #include <stdio.h>
 #include <stdint.h>

diff  --git a/lldb/test/API/python_api/lldbutil/process/main.cpp b/lldb/test/API/python_api/lldbutil/process/main.cpp
index a490d8f9900b..f31003609587 100644
--- a/lldb/test/API/python_api/lldbutil/process/main.cpp
+++ b/lldb/test/API/python_api/lldbutil/process/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 static int foo(int x, int y) {
   return x + y; // BREAK HERE
 }

diff  --git a/lldb/test/API/python_api/objc_type/main.m b/lldb/test/API/python_api/objc_type/main.m
index a2a7b0b4bcea..941442f4da39 100644
--- a/lldb/test/API/python_api/objc_type/main.m
+++ b/lldb/test/API/python_api/objc_type/main.m
@@ -1,11 +1,3 @@
-//===-- main.m ------------------------------------------------*- ObjC -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #import <Foundation/Foundation.h>
 
 @interface Foo: NSObject

diff  --git a/lldb/test/API/python_api/process/main.cpp b/lldb/test/API/python_api/process/main.cpp
index 32c6dee8044c..f3cc7e12d335 100644
--- a/lldb/test/API/python_api/process/main.cpp
+++ b/lldb/test/API/python_api/process/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/python_api/sbdata/main.cpp b/lldb/test/API/python_api/sbdata/main.cpp
index 78e071c931ed..526e8cfbbd57 100644
--- a/lldb/test/API/python_api/sbdata/main.cpp
+++ b/lldb/test/API/python_api/sbdata/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdint.h>
 
 struct foo

diff  --git a/lldb/test/API/python_api/sbtype_typeclass/main.m b/lldb/test/API/python_api/sbtype_typeclass/main.m
index 8e9601e42eb9..cf479221cd56 100644
--- a/lldb/test/API/python_api/sbtype_typeclass/main.m
+++ b/lldb/test/API/python_api/sbtype_typeclass/main.m
@@ -1,10 +1,3 @@
-//===-- main.m --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #import <Foundation/Foundation.h>
 
 @interface ThisClassTestsThings : NSObject

diff  --git a/lldb/test/API/python_api/section/main.c b/lldb/test/API/python_api/section/main.c
index f12ef5afb7ab..9d73ac724cd3 100644
--- a/lldb/test/API/python_api/section/main.c
+++ b/lldb/test/API/python_api/section/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <string.h>
 

diff  --git a/lldb/test/API/python_api/signals/main.cpp b/lldb/test/API/python_api/signals/main.cpp
index c4c5a00dd09d..ef29e91685c8 100644
--- a/lldb/test/API/python_api/signals/main.cpp
+++ b/lldb/test/API/python_api/signals/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <sys/types.h>
 #if defined(_WIN32)

diff  --git a/lldb/test/API/python_api/symbol-context/main.c b/lldb/test/API/python_api/symbol-context/main.c
index 4e68fb764b8f..b6d3ee338623 100644
--- a/lldb/test/API/python_api/symbol-context/main.c
+++ b/lldb/test/API/python_api/symbol-context/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python API SBSymbolContext.

diff  --git a/lldb/test/API/python_api/target/main.c b/lldb/test/API/python_api/target/main.c
index d075f2cf2d36..0d0580dd10e9 100644
--- a/lldb/test/API/python_api/target/main.c
+++ b/lldb/test/API/python_api/target/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python API SBTarget.

diff  --git a/lldb/test/API/python_api/thread/main.cpp b/lldb/test/API/python_api/thread/main.cpp
index 01c8404a3872..dde740a1b6bf 100644
--- a/lldb/test/API/python_api/thread/main.cpp
+++ b/lldb/test/API/python_api/thread/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 // This simple program is to test the lldb Python API related to thread.

diff  --git a/lldb/test/API/python_api/thread/main2.cpp b/lldb/test/API/python_api/thread/main2.cpp
index 57c485c08c68..b07841ccc682 100644
--- a/lldb/test/API/python_api/thread/main2.cpp
+++ b/lldb/test/API/python_api/thread/main2.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdlib.h>
 

diff  --git a/lldb/test/API/python_api/type/main.cpp b/lldb/test/API/python_api/type/main.cpp
index b43b617b0f90..40799abe36d3 100644
--- a/lldb/test/API/python_api/type/main.cpp
+++ b/lldb/test/API/python_api/type/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 class Task {

diff  --git a/lldb/test/API/python_api/value/empty_class/main.cpp b/lldb/test/API/python_api/value/empty_class/main.cpp
index 483a57ee5c0d..9051dbb5277e 100644
--- a/lldb/test/API/python_api/value/empty_class/main.cpp
+++ b/lldb/test/API/python_api/value/empty_class/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 class Empty {};
 
 int main (int argc, char const *argv[]) {

diff  --git a/lldb/test/API/python_api/value/linked_list/main.cpp b/lldb/test/API/python_api/value/linked_list/main.cpp
index edd175ae2663..13982bfe9818 100644
--- a/lldb/test/API/python_api/value/linked_list/main.cpp
+++ b/lldb/test/API/python_api/value/linked_list/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 class Task {

diff  --git a/lldb/test/API/python_api/value/main.c b/lldb/test/API/python_api/value/main.c
index 68b3c12cce41..c2e0dc8c12dd 100644
--- a/lldb/test/API/python_api/value/main.c
+++ b/lldb/test/API/python_api/value/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/python_api/watchpoint/condition/main.cpp b/lldb/test/API/python_api/watchpoint/condition/main.cpp
index 3f7c5f5be966..f0d14f384041 100644
--- a/lldb/test/API/python_api/watchpoint/condition/main.cpp
+++ b/lldb/test/API/python_api/watchpoint/condition/main.cpp
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/python_api/watchpoint/main.c b/lldb/test/API/python_api/watchpoint/main.c
index 6cda6d7c886e..80d35a920d67 100644
--- a/lldb/test/API/python_api/watchpoint/main.c
+++ b/lldb/test/API/python_api/watchpoint/main.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdint.h>
 

diff  --git a/lldb/test/API/python_api/watchpoint/watchlocation/main.cpp b/lldb/test/API/python_api/watchpoint/watchlocation/main.cpp
index e455331bc163..0c5f5a6c836f 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/main.cpp
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <condition_variable>
 #include <cstdio>

diff  --git a/lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp
index b62ca71b561d..e9bc27149b00 100644
--- a/lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp
+++ b/lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int main(int argc, char **argv) {
   // Perform a null pointer access.
   int *const null_int_ptr = nullptr;

diff  --git a/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
index 47d4b979d92e..07b6e0466784 100644
--- a/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
+++ b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
@@ -1,9 +1 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int svr4lib_a() { return 42; }

diff  --git a/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
index bd8eb0068e91..de56566c504a 100644
--- a/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
+++ b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
@@ -1,9 +1 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 int svr4lib_b_quote() { return 42; }

diff  --git a/lldb/test/API/tools/lldb-server/main.cpp b/lldb/test/API/tools/lldb-server/main.cpp
index f1d46b854255..992288355f15 100644
--- a/lldb/test/API/tools/lldb-server/main.cpp
+++ b/lldb/test/API/tools/lldb-server/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <atomic>
 #include <chrono>
 #include <cstdlib>

diff  --git a/lldb/test/API/tools/lldb-server/signal-filtering/main.cpp b/lldb/test/API/tools/lldb-server/signal-filtering/main.cpp
index fe33c2919582..5c6813ea5831 100644
--- a/lldb/test/API/tools/lldb-server/signal-filtering/main.cpp
+++ b/lldb/test/API/tools/lldb-server/signal-filtering/main.cpp
@@ -1,11 +1,3 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <signal.h>
 #include <stdio.h>
 #include <vector>

diff  --git a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
index 31817bdaaa5c..0b277bb9426d 100644
--- a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
@@ -1 +1 @@
-target stop-hook add -f stop-hook.c -l 29 -e 34 -o "expr ptr"
+target stop-hook add -f stop-hook.c -l 21 -e 26 -o "expr ptr"

diff  --git a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
index 36e144deecc0..35fe976badc0 100644
--- a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
@@ -1,3 +1,3 @@
-target stop-hook add -f stop-hook.c -l 29 -e 34
+target stop-hook add -f stop-hook.c -l 21 -e26
 expr ptr
 DONE

diff  --git a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
index 46aae8346be8..4701a1ce6384 100644
--- a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
@@ -1,11 +1,3 @@
-//===-- stop-hook-threads.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <chrono>
 #include <cstdio>
 #include <mutex>

diff  --git a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
index e1b2579526d3..025727aec582 100644
--- a/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
@@ -1,10 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
 #include <stdio.h>
 #include <stdlib.h>
 

diff  --git a/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
index e632c821d577..1590aec2d6c6 100644
--- a/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
+++ b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
@@ -1,4 +1,4 @@
-breakpoint set -f simple.c -l 12
+breakpoint set -f simple.c -l 4
 run
 bt
 cont

diff  --git a/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCrashCapture.in b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCrashCapture.in
index 1a733f4dd94f..8554acf769ad 100644
--- a/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCrashCapture.in
+++ b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCrashCapture.in
@@ -1,4 +1,4 @@
-breakpoint set -f simple.c -l 12
+breakpoint set -f simple.c -l 4
 run
 bt
 cont

diff  --git a/lldb/test/Shell/Reproducer/Inputs/MultipleTargetsCapture.in b/lldb/test/Shell/Reproducer/Inputs/MultipleTargetsCapture.in
index c78d6276c89f..28e633464346 100644
--- a/lldb/test/Shell/Reproducer/Inputs/MultipleTargetsCapture.in
+++ b/lldb/test/Shell/Reproducer/Inputs/MultipleTargetsCapture.in
@@ -1,8 +1,8 @@
 target select 0
-breakpoint set -f simple.c -l 12
+breakpoint set -f simple.c -l 4
 run
 target select 1
-breakpoint set -f simple.c -l 16
+breakpoint set -f simple.c -l 8
 run
 target select 0
 cont

diff  --git a/lldb/test/Shell/Reproducer/Inputs/simple.c b/lldb/test/Shell/Reproducer/Inputs/simple.c
index ef14878bcf9c..903d414e277b 100644
--- a/lldb/test/Shell/Reproducer/Inputs/simple.c
+++ b/lldb/test/Shell/Reproducer/Inputs/simple.c
@@ -1,11 +1,3 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
 #include <stdio.h>
 
 void foo() {

diff  --git a/lldb/test/Shell/Reproducer/TestMultipleTargets.test b/lldb/test/Shell/Reproducer/TestMultipleTargets.test
index f36dbf6b5c44..ce1a5ecdd4c8 100644
--- a/lldb/test/Shell/Reproducer/TestMultipleTargets.test
+++ b/lldb/test/Shell/Reproducer/TestMultipleTargets.test
@@ -10,10 +10,10 @@
 
 # CHECK: Process [[TARGET0:[0-9]+]] stopped
 # CHECK: stop reason = breakpoint 1.1
-# CHECK: simple.c:12:5
+# CHECK: simple.c:4:5
 # CHECK: Process [[TARGET1:[0-9]+]] stopped
 # CHECK: stop reason = breakpoint 1.1
-# CHECK: simple.c:16:5
+# CHECK: simple.c:8:5
 # CHECK: Process [[TARGET0]] resuming
 # CHECK: Process [[TARGET0]] exited
 # CHECK: Process [[TARGET1]] resuming


        


More information about the lldb-commits mailing list