Update tests and delete REPL code

Reviewed By: willholen Differential Revision: D21000367 fbshipit-source-id: 39942050234fb72f82160eb8ae09ac0a18452a0b
TymanWasTaken · Apr 21, 2020 · cc64ff9 · cc64ff9
1 parent c946846
commit cc64ff9
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 732 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -533,7 +533,6 @@ list(APPEND HERMES_TEST_DEPS
   interp-dispatch-bench
   hdb
   hbcdump
-  hermes-repl
   hbc-attribute
   hbc-deltaprep
   hbc-diff
@@ -552,7 +551,6 @@ set(HERMES_LIT_TEST_PARAMS
   hermesc=${HERMES_TOOLS_OUTPUT_DIR}/hermesc
   hdb=${HERMES_TOOLS_OUTPUT_DIR}/hdb
   hbcdump=${HERMES_TOOLS_OUTPUT_DIR}/hbcdump
-  repl=${HERMES_TOOLS_OUTPUT_DIR}/hermes-repl
   hbc-deltaprep=${HERMES_TOOLS_OUTPUT_DIR}/hbc-deltaprep
   hbc_diff=${HERMES_TOOLS_OUTPUT_DIR}/hbc-diff
   build_mode=${HERMES_ASSUMED_BUILD_MODE_IN_LIT_TEST}
@@ -603,11 +601,11 @@ add_custom_target(make_bundle_dir DEPENDS ${HERMES_GITHUB_BUNDLE_DIR})
 add_custom_command(
   OUTPUT ${HERMES_GITHUB_DIR}/${HERMES_CLI_GITHUB_FILE}
   WORKING_DIRECTORY ${HERMES_GITHUB_BUNDLE_DIR}
-  DEPENDS hermes hermesc hdb hbcdump hermes-repl make_bundle_dir
+  DEPENDS hermes hermesc hdb hbcdump make_bundle_dir
   VERBATIM
   COMMAND
     # We need bin/hermes or Release/bin/hermes.exe in a predictable location
-    ${CMAKE_COMMAND} -E copy $<TARGET_FILE:hermes> $<TARGET_FILE:hermes-repl> $<TARGET_FILE:hermesc> $<TARGET_FILE:hdb> $<TARGET_FILE:hbcdump> ${HERMES_GITHUB_EXTRAS} .
+    ${CMAKE_COMMAND} -E copy $<TARGET_FILE:hermes> $<TARGET_FILE:hermesc> $<TARGET_FILE:hdb> $<TARGET_FILE:hbcdump> ${HERMES_GITHUB_EXTRAS} .
   COMMAND
     ${CMAKE_COMMAND} -E tar zcf ${HERMES_GITHUB_DIR}/${HERMES_CLI_GITHUB_FILE} .
 )

diff --git a/include/hermes/CompilerDriver/CompilerDriver.h b/include/hermes/CompilerDriver/CompilerDriver.h
@@ -85,9 +85,6 @@ void printHermesCompilerVMVersion(llvm::raw_ostream &s);
 /// Print the Hermes version (without VM) to the given stream \p s.
 void printHermesCompilerVersion(llvm::raw_ostream &s);
 
-/// Print the Hermes version for the REPL to the given stream \p s.
-void printHermesREPLVersion(llvm::raw_ostream &s);
-
 } // namespace driver
 } // namespace hermes
 

diff --git a/include/hermes/ConsoleHost/MemorySizeParser.h b/include/hermes/ConsoleHost/MemorySizeParser.h
@@ -17,7 +17,7 @@
 
 /// This file defines flags that are specific to the Hermes runtime,
 /// independent of the Hermes compiler.  Such flags must be defined in the
-/// hermes, hvm, and repl binaries, so this file is included in all of those.
+/// hermes and hvm binaries, so this file is included in all of those.
 
 namespace cl {
 

diff --git a/include/hermes/ConsoleHost/RuntimeFlags.h b/include/hermes/ConsoleHost/RuntimeFlags.h
@@ -19,7 +19,7 @@
 
 /// This file defines flags that are specific to the Hermes runtime,
 /// independent of the Hermes compiler.  Such flags must be defined in the
-/// hermes, hvm, and repl binaries, so this file is included in all of those.
+/// hermes and hvm binaries, so this file is included in all of those.
 
 namespace cl {
 

diff --git a/lib/CompilerDriver/CompilerDriver.cpp b/lib/CompilerDriver/CompilerDriver.cpp
@@ -1855,9 +1855,7 @@ void printHermesCompilerVMVersion(llvm::raw_ostream &s) {
 void printHermesCompilerVersion(llvm::raw_ostream &s) {
   printHermesVersion(s);
 }
-void printHermesREPLVersion(llvm::raw_ostream &s) {
-  printHermesVersion(s, " REPL", false);
-}
+
 OutputFormatKind outputFormatFromCommandLineOptions() {
   return cl::DumpTarget;
 }

diff --git a/npm/hermes-engine-cli/package.json b/npm/hermes-engine-cli/package.json
@@ -13,12 +13,10 @@
     "linux64-bin/hbcdump",
     "linux64-bin/hdb",
     "linux64-bin/hermes",
-    "linux64-bin/hermes-repl",
     "linux64-bin/hermesc",
     "osx-bin/hbcdump",
     "osx-bin/hdb",
     "osx-bin/hermes",
-    "osx-bin/hermes-repl",
     "osx-bin/hermesc",
     "win64-bin/icudt64.dll",
     "win64-bin/icuin64.dll",
@@ -30,7 +28,6 @@
     "win64-bin/vcruntime140.dll",
     "win64-bin/hbcdump.exe",
     "win64-bin/hdb.exe",
-    "win64-bin/hermes-repl.exe",
     "win64-bin/hermes.exe",
     "win64-bin/hermesc.exe"
   ]

diff --git a/test/lit.cfg b/test/lit.cfg
@@ -75,4 +75,3 @@ config.substitutions.append(("%hdb", lit_config.params["hdb"].replace('\\', '/')
 config.substitutions.append(("%hbcdump", lit_config.params["hbcdump"].replace('\\', '/')))
 config.substitutions.append(("%hbc-deltaprep", lit_config.params["hbc_deltaprep"].replace('\\', '/')))
 config.substitutions.append(("%hbc-diff", lit_config.params["hbc_diff"].replace('\\', '/')))
-config.substitutions.append(("%repl", lit_config.params["repl"].replace('\\', '/')))
diff --git a/test/repl/assignment.js b/test/repl/assignment.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" 2>&1 | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" 2>&1 | %FileCheck --match-full-lines %s
 
 "assignment"
 // CHECK-LABEL: "assignment"

diff --git a/test/repl/multiline.js b/test/repl/multiline.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" -prompt2 "" | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" -prompt2="" | %FileCheck --match-full-lines %s
 
 "multiline"
 // CHECK-LABEL: "multiline"

diff --git a/test/repl/pretty.js b/test/repl/pretty.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" -prompt2 "" | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" -prompt2="" | %FileCheck --match-full-lines %s
 
 "pretty printer"
 // CHECK-LABEL: "pretty printer"

diff --git a/test/repl/regress-colors.js b/test/repl/regress-colors.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" -prompt2 "" | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" -prompt2="" | %FileCheck --match-full-lines %s
 
 throw new SyntaxError();
 // CHECK: SyntaxError

diff --git a/test/repl/regress-mismatched.js b/test/repl/regress-mismatched.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" -prompt2 "" | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" -prompt2="" | %FileCheck --match-full-lines %s
 
 new Set[1,2,3])
 // CHECK: SyntaxError: 1:15:';' expected

diff --git a/test/repl/wrapped-eval.js b/test/repl/wrapped-eval.js
@@ -6,7 +6,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-// RUN: cat %s | %repl -prompt "" | %FileCheck --match-full-lines %s
+// RUN: cat %s | %hermes -prompt="" | %FileCheck --match-full-lines %s
 
 "wrapped eval"
 // CHECK-LABEL: "wrapped eval"

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory(hdb)
 add_subdirectory(hbcdump)
 add_subdirectory(hvm)
 add_subdirectory(hvm-bench)
-add_subdirectory(repl)
 add_subdirectory(hbc-diff)
 add_subdirectory(hbc-deltaprep)
 add_subdirectory(hbc-attribute)

diff --git a/tools/repl/CMakeLists.txt b/tools/repl/CMakeLists.txt
diff --git a/tools/repl/ReplConfig.h.in b/tools/repl/ReplConfig.h.in