[Lldb-commits] [lldb] r345435 - Fix and rename broken test for `settings write`.

Fri Oct 26 16:01:25 PDT 2018

Author: jdevlieghere
Date: Fri Oct 26 16:01:25 2018
New Revision: 345435

URL: http://llvm.org/viewvc/llvm-project?rev=345435&view=rev
Log:
Fix and rename broken test for `settings write`.

I committed this test without updating the old `settings export` to
settings write. Since the functionality was renamed I also renamed the
test case.

Added:
    lldb/trunk/lit/Settings/TestSettingsWrite.test
      - copied, changed from r345402, lldb/trunk/lit/Settings/TestExport.test
Removed:
    lldb/trunk/lit/Settings/TestExport.test

Removed: lldb/trunk/lit/Settings/TestExport.test
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Settings/TestExport.test?rev=345434&view=auto
==============================================================================

--- lldb/trunk/lit/Settings/TestExport.test (original)
+++ lldb/trunk/lit/Settings/TestExport.test (removed)
@@ -1,32 +0,0 @@
-# This tests writing and reading settings from LLDB.
-
-# Check that the settings can be written to file and read again without
-# altering the values.
-# RUN: %lldb -b -o 'settings write -f %t.foo' -o 'settings read -f %t.foo' -o 'settings export %t.bar' -o 'settings read -f %t.bar' 2>&1 | FileCheck %s --check-prefix SUCCESS
-# RUN: diff -w %t.foo %t.bar
-# SUCCESS-NOT: error:
-
-# Check that exporting target settings only export target settings and nothing else.
-# RUN: %lldb -b -o 'settings write -f %t.target target' 2>&1 | FileCheck %s --check-prefix SUCCESS
-# RUN: cat %t.target | FileCheck %s --check-prefix TARGET
-# TARGET: settings set target
-# TARGET-NOT: settings set platform
-# TARGET-NOT: settings set symbols
-# TARGET-NOT: settings set interpreter
-# TARGET-NOT: settings set plugin
-
-# Check that settings appear twice when appending.
-# RUN: %lldb -b -o 'settings write -a -f %t.append target' -o 'settings write -a -f %t.append target' 2>&1 | FileCheck %s --check-prefix SUCCESS
-# RUN: cat %t.append | FileCheck %s --check-prefix APPEND
-# APPEND: settings set target.language
-# APPEND: settings set target.language
-
-# Check that an error is printed for non-existing setting.
-# RUN: echo "settings set bogus" > %t.bogus_setting
-# RUN: %lldb -b -o 'settings read -f %t.bogus_setting' 2>&1 | FileCheck %s --check-prefix BOGUS-SETTING
-# BOGUS-SETTING: error: invalid value path
-
-# Check that an error is printed for invalid value.
-# RUN: echo "settings set target.language bogus" > %t.bogus_value
-# RUN: %lldb -b -o 'settings read -f %t.bogus_value' 2>&1 | FileCheck %s --check-prefix BOGUS-VALUE
-# BOGUS-VALUE: error: invalid language type

Copied: lldb/trunk/lit/Settings/TestSettingsWrite.test (from r345402, lldb/trunk/lit/Settings/TestExport.test)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Settings/TestSettingsWrite.test?p2=lldb/trunk/lit/Settings/TestSettingsWrite.test&p1=lldb/trunk/lit/Settings/TestExport.test&r1=345402&r2=345435&rev=345435&view=diff
==============================================================================
--- lldb/trunk/lit/Settings/TestExport.test (original)
+++ lldb/trunk/lit/Settings/TestSettingsWrite.test Fri Oct 26 16:01:25 2018
@@ -2,31 +2,31 @@
 
 # Check that the settings can be written to file and read again without
 # altering the values.
-# RUN: %lldb -b -o 'settings write -f %t.foo' -o 'settings read -f %t.foo' -o 'settings export %t.bar' -o 'settings read -f %t.bar' 2>&1 | FileCheck %s --check-prefix SUCCESS
+# RUN: %lldb -b -o 'settings write -f %t.foo' -o 'settings read -f %t.foo' -o 'settings write -f %t.bar' -o 'settings read -f %t.bar' 2>&1 | FileCheck %s --check-prefix SUCCESS
 # RUN: diff -w %t.foo %t.bar
 # SUCCESS-NOT: error:
 
 # Check that exporting target settings only export target settings and nothing else.
 # RUN: %lldb -b -o 'settings write -f %t.target target' 2>&1 | FileCheck %s --check-prefix SUCCESS
 # RUN: cat %t.target | FileCheck %s --check-prefix TARGET
-# TARGET: settings set target
-# TARGET-NOT: settings set platform
-# TARGET-NOT: settings set symbols
-# TARGET-NOT: settings set interpreter
-# TARGET-NOT: settings set plugin
+# TARGET: settings set -f target
+# TARGET-NOT: settings set -f platform
+# TARGET-NOT: settings set -f symbols
+# TARGET-NOT: settings set -f interpreter
+# TARGET-NOT: settings set -f plugin
 
 # Check that settings appear twice when appending.
 # RUN: %lldb -b -o 'settings write -a -f %t.append target' -o 'settings write -a -f %t.append target' 2>&1 | FileCheck %s --check-prefix SUCCESS
 # RUN: cat %t.append | FileCheck %s --check-prefix APPEND
-# APPEND: settings set target.language
-# APPEND: settings set target.language
+# APPEND: settings set -f target.language
+# APPEND: settings set -f target.language
 
 # Check that an error is printed for non-existing setting.
-# RUN: echo "settings set bogus" > %t.bogus_setting
+# RUN: echo "settings set -f bogus" > %t.bogus_setting
 # RUN: %lldb -b -o 'settings read -f %t.bogus_setting' 2>&1 | FileCheck %s --check-prefix BOGUS-SETTING
 # BOGUS-SETTING: error: invalid value path
 
 # Check that an error is printed for invalid value.
-# RUN: echo "settings set target.language bogus" > %t.bogus_value
+# RUN: echo "settings set -f target.language bogus" > %t.bogus_value
 # RUN: %lldb -b -o 'settings read -f %t.bogus_value' 2>&1 | FileCheck %s --check-prefix BOGUS-VALUE
 # BOGUS-VALUE: error: invalid language type


