[Lldb-commits] [lldb] 8ba8a4a - Revert "[intel-pt] Implement a basic test case"

[Walter Erquinigo via lldb-commits]

Author: Walter Erquinigo
Date: 2020-04-01T13:27:30-07:00
New Revision: 8ba8a4a14d417abd4a104c0f8b5ec289ed0a1b16

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

LOG: Revert "[intel-pt] Implement a basic test case"

This reverts commit f1242ec54306c5fbdc9a907e936be899a0ad21ee.

Added: 
    

Modified: 
    lldb/tools/intel-features/intel-pt/cli-wrapper-pt.cpp

Removed: 
    lldb/test/API/tools/intel-features/intel-pt/test/Makefile
    lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
    lldb/test/API/tools/intel-features/intel-pt/test/main.cpp


################################################################################
diff  --git a/lldb/test/API/tools/intel-features/intel-pt/test/Makefile b/lldb/test/API/tools/intel-features/intel-pt/test/Makefile
deleted file mode 100644
index 99998b20bcb0..000000000000
--- a/lldb/test/API/tools/intel-features/intel-pt/test/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-CXX_SOURCES := main.cpp
-
-include Makefile.rules

diff  --git a/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py b/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
deleted file mode 100644
index 29bcf3de696a..000000000000
--- a/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from __future__ import print_function
-
-import os
-import lldb
-import time
-
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestIntelPTSimpleBinary(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    NO_DEBUG_INFO_TESTCASE = True
-
-    @skipIf(oslist=no_match(['linux']))
-    @skipIf(archs=no_match(['i386', 'x86_64']))
-    @skipIfRemote
-    def test_basic_flow(self):
-        """Test collection, decoding, and dumping instructions"""
-        lldb_exec_dir = os.environ["LLDB_IMPLIB_DIR"]
-        lldb_lib_dir = os.path.join(lldb_exec_dir, os.pardir, "lib")
-        plugin_file = os.path.join(lldb_lib_dir, "liblldbIntelFeatures.so")
-        if not os.path.isfile(plugin_file):
-            self.skipTest("features plugin missing.")
-
-        self.build()
-
-        self.runCmd("plugin load " + plugin_file)
-
-        exe = self.getBuildArtifact("a.out")
-        lldbutil.run_to_name_breakpoint(self, "main", exe_name=exe)
-        # We start tracing from main
-        self.runCmd("processor-trace start all")
-
-        # We check the trace after the for loop
-        self.runCmd("b " + str(line_number('main.cpp', '// Break 1')))
-        self.runCmd("c")
-
-        # We wait a little bit to ensure the processor has send the PT packets to
-        # the memory
-        time.sleep(.1)
-
-        # We find the start address of the 'fun' function for a later check
-        target = self.dbg.GetSelectedTarget()
-        fun_start_adddress = target.FindFunctions("fun")[0].GetSymbol() \
-            .GetStartAddress().GetLoadAddress(target)
-
-        # We print the last instructions
-        self.expect("processor-trace show-instr-log -c 100",
-            patterns=[
-                # We expect to have seen the first instruction of 'fun'
-                hex(fun_start_adddress),  
-                # We expect to see the exit condition of the for loop
-                "at main.cpp:" + str(line_number('main.cpp', '// Break for loop')) 
-            ])
-
-        self.runCmd("processor-trace stop")

diff  --git a/lldb/test/API/tools/intel-features/intel-pt/test/main.cpp b/lldb/test/API/tools/intel-features/intel-pt/test/main.cpp
deleted file mode 100644
index ea826a2ac0c6..000000000000
--- a/lldb/test/API/tools/intel-features/intel-pt/test/main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <iostream>
-
-using namespace std;
-
-int fun(int a) { return a * a + 1; }
-
-int main() {
-  int z = 0;
-  for (int i = 0; i < 10000; i++) { // Break for loop
-    z += fun(z);
-  }
-
-  return 0; // Break 1
-}

diff  --git a/lldb/tools/intel-features/intel-pt/cli-wrapper-pt.cpp b/lldb/tools/intel-features/intel-pt/cli-wrapper-pt.cpp
index 5e409a269fa4..8db1c0f82d66 100644
--- a/lldb/tools/intel-features/intel-pt/cli-wrapper-pt.cpp
+++ b/lldb/tools/intel-features/intel-pt/cli-wrapper-pt.cpp
@@ -191,7 +191,6 @@ class ProcessorTraceStart : public lldb::SBCommandPluginInterface {
       result.SetStatus(lldb::eReturnStatusFailed);
       return false;
     }
-    result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
     return true;
   }
 
@@ -291,7 +290,6 @@ class ProcessorTraceInfo : public lldb::SBCommandPluginInterface {
                  s.GetData());
       result.AppendMessage(res.GetOutput());
     }
-    result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
     return true;
   }
 
@@ -430,7 +428,6 @@ class ProcessorTraceShowInstrLog : public lldb::SBCommandPluginInterface {
       }
       result.AppendMessage(res.GetOutput());
     }
-    result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
     return true;
   }
 
@@ -483,7 +480,6 @@ class ProcessorTraceStop : public lldb::SBCommandPluginInterface {
       result.SetStatus(lldb::eReturnStatusFailed);
       return false;
     }
-    result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
     return true;
   }