Fix llvm-cas tests to match new cmd line argument format

Author: rastogishubham

test/CAS/cas-explicit-module-map.swift

@@ -17,28 +17,28 @@
 // RUN: llvm-cas --cas %t/cas --cat-blob @%t/A.result > %t/kind.blob
 
 /// Make keys for module loads. The result casid construction is tied with the actual structure of CompilerJobResultSchema.
-// RUN: llvm-cas --cas %t/cas --make-blob --data %stdlib_module | tr -d '\n' > %t/Swift.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/Swift.key @%t/schema.casid  > %t/Swift.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %stdlib_module | tr -d '\n' > %t/Swift.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/Swift.key @%t/schema.casid  > %t/Swift.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/Swift.key @%t/Swift.casid
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %ononesupport_module | tr -d '\n' > %t/ONone.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/ONone.key @%t/schema.casid > %t/ONone.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %ononesupport_module | tr -d '\n' > %t/ONone.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/ONone.key @%t/schema.casid > %t/ONone.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/ONone.key @%t/ONone.casid
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %concurrency_module | tr -d '\n' > %t/Concurrency.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/Concurrency.key @%t/schema.casid > %t/Concurrency.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %concurrency_module | tr -d '\n' > %t/Concurrency.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/Concurrency.key @%t/schema.casid > %t/Concurrency.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/Concurrency.key @%t/Concurrency.casid
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %string_processing_module | tr -d '\n' > %t/String.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/String.key @%t/schema.casid > %t/String.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %string_processing_module | tr -d '\n' > %t/String.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/String.key @%t/schema.casid > %t/String.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/String.key @%t/String.casid
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %t/SwiftShims.pcm | tr -d '\n' > %t/Shims.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/Shims.key @%t/schema.casid > %t/Shims.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %t/SwiftShims.pcm | tr -d '\n' > %t/Shims.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/Shims.key @%t/schema.casid > %t/Shims.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/Shims.key @%t/Shims.casid
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %t/_SwiftConcurrencyShims.pcm | tr -d '\n' > %t/ConcurrencyShims.key
-// RUN: llvm-cas --cas %t/cas --make-node --data %t/kind.blob @%t/ConcurrencyShims.key @%t/schema.casid > %t/ConcurrencyShims.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %t/_SwiftConcurrencyShims.pcm | tr -d '\n' > %t/ConcurrencyShims.key
+// RUN: llvm-cas --cas %t/cas --make-node %t/kind.blob @%t/ConcurrencyShims.key @%t/schema.casid > %t/ConcurrencyShims.casid
 // RUN: llvm-cas --cas %t/cas --put-cache-key @%t/ConcurrencyShims.key @%t/ConcurrencyShims.casid
 
 // RUN: echo "[{" > %/t/map.json
@@ -106,7 +106,7 @@
 // RUN: echo "\"isFramework\": false" >> %/t/map.json
 // RUN: echo "}]" >> %/t/map.json
 
-// RUN: llvm-cas --cas %t/cas --make-blob --data %t/map.json > %t/map.casid
+// RUN: llvm-cas --cas %t/cas --make-blob %t/map.json > %t/map.casid
 
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/Foo.swiftmodule -disable-implicit-swift-modules -module-cache-path %t.module-cache -explicit-swift-module-map-file @%t/map.casid -Rmodule-loading -Xcc -Rmodule-import %s -cache-compile-job -cas-path %t/cas -allow-unstable-cache-key-for-testing 2>&1 | %FileCheck %s
 

test/CAS/cas_fs.swift

@@ -2,11 +2,11 @@
 // RUN: mkdir -p %t/empty
 // RUN: mkdir -p %t/cas
 
-// RUN: llvm-cas --cas %t/cas --ingest --data %t/empty > %t/empty.casid
+// RUN: llvm-cas --cas %t/cas --ingest %t/empty > %t/empty.casid
 // RUN: not %target-swift-frontend -typecheck -cache-compile-job -cas-fs @%t/empty.casid -cas-path %t/cas %s 2>&1 | %FileCheck %s --check-prefix NO-INPUTS
 // NO-INPUTS: error: error opening input file
 
-// RUN: llvm-cas --cas %t/cas --ingest --data %s > %t/source.casid
+// RUN: llvm-cas --cas %t/cas --ingest %s > %t/source.casid
 // RUN: not %target-swift-frontend -typecheck -cache-compile-job -cas-fs @%t/source.casid -cas-path %t/cas %s 2>&1 | %FileCheck %s --check-prefix NO-RESOURCES
 // NO-RESOURCES: error: unable to load standard library