[Backtracing] Tweak tests slightly.

`JSONEncoder` by default will escape slashes, which results in a string
that isn't technically valid Base64.  Since that behaviour is optional,
turn it off, and at the same time tell it to output in lexical key
order, which makes the test slightly simpler (no `CHECK-DAG` needed).

Also fixed a typo in `test_swift.py`

rdar://124913332

Author: al45tair

test/Backtracing/CodableBacktrace.swift

@@ -33,16 +33,16 @@ func level5() {
   let backtrace = try! Backtrace.capture()
 
   let encoder = JSONEncoder()
-  encoder.outputFormatting = .prettyPrinted
+  encoder.outputFormatting = [.prettyPrinted,.sortedKeys,.withoutEscapingSlashes]
 
   let data = try! encoder.encode(backtrace)
   let json = String(data: data, encoding: .utf8)!
 
   print(json)
 
   // CHECK: {
-  // CHECK-DAG:    "architecture" : "{{.*}}"
-  // CHECK-DAG:    "backtrace" : "{{[A-Za-z0-9+/]*}}"
+  // CHECK:    "architecture" : "{{.*}}",
+  // CHECK:    "backtrace" : "{{[A-Za-z0-9+/]*}}"
   // CHECK: }
 
   let decoder = JSONDecoder()

utils/swift_build_support/tests/products/test_swift.py

@@ -484,7 +484,7 @@ def test_runtime_module_flags(self):
             ['-DSWIFT_ENABLE_RUNTIME_MODULE:BOOL='
              'TRUE'],
             [x for x in swift.cmake_options
-             if 'DSWIFT_ENABLE_RUNTIME_MODULE in x])
+             if 'DSWIFT_ENABLE_RUNTIME_MODULE' in x])
 
     def test_freestanding_is_darwin_flags(self):
         self.args.swift_freestanding_is_darwin = True