old_contents: """
  Test that lldb persistent variables works correctly.
  """
  
  import os, time
  import unittest2
  import lldb
  from lldbtest import *
  
  class PersistentVariablesTestCase(TestBase):
  
      mydir = os.path.join("expression_command", "persistent_variables")
  
      def test_persistent_variables(self):
          """Test that lldb persistent variables works correctly."""
          self.buildDefault()
  
          self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
  
          self.runCmd("breakpoint set --name main")
  
          self.runCmd("run", RUN_SUCCEEDED)
  
          self.expect("expression int $i = 5; $i + 1",
              startstr = "(int) $0 = 6")
          # (int) $0 = 6
  
          self.expect("expression $i + 3",
              startstr = "(int) $1 = 8")
          # (int) $1 = 8
  
          self.expect("expression $1 + $0",
              startstr = "(int) $2 = 14")
          # (int) $2 = 14
  
          self.expect("expression $2",
              startstr = "(int) $3 = 14")
          # (int) $3 =  14
  
  
  if __name__ == '__main__':
      import atexit
      lldb.SBDebugger.Initialize()
      atexit.register(lambda: lldb.SBDebugger.Terminate())
      unittest2.main()
  
new_contents: """
  Test that lldb persistent variables works correctly.
  """
  
  import os, time
  import unittest2
  import lldb
  from lldbtest import *
  
  class PersistentVariablesTestCase(TestBase):
  
      mydir = os.path.join("expression_command", "persistent_variables")
  
      def test_persistent_variables(self):
          """Test that lldb persistent variables works correctly."""
          self.buildDefault()
  
          self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
  
          self.runCmd("breakpoint set --name main")
  
          self.runCmd("run", RUN_SUCCEEDED)
  
          self.expect("expression int $i = 5; $i + 1",
              startstr = "(int) $0 = 6")
          # (int) $0 = 6
  
          self.expect("expression $i + 3",
              startstr = "(int) $1 = 8")
          # (int) $1 = 8
  
          self.expect("expression $1 + $0",
              startstr = "(int) $2 = 14")
          # (int) $2 = 14
  
          self.expect("expression $2",
              startstr = "(int) $2 = 14")
          # (int) $2 =  14
  
          self.expect("expression $1",
              startstr = "(int) $1 = 8")
          # (int) $1 = 8
  
  
  if __name__ == '__main__':
      import atexit
      lldb.SBDebugger.Initialize()
      atexit.register(lambda: lldb.SBDebugger.Terminate())
      unittest2.main()
  
subject: Change the golden output so that merely evaluating an existing persistent variable does not result in a newly created persistent variable. The old one is returned, instead.