merge: solved conflict with div branches

Author: sashbek

tests/CMakeLists.txt

@@ -1,5 +1,24 @@
 enable_testing()
 
+
+
+If (JIT_PROVIDED)
+add_executable(
+        ${PROJECT_NAME}_tests
+        main_test.cpp
+        test_functions.cpp
+        test_suites/ProjectIntegrationTestSuite.cpp
+        test_suites/X64JitTestSuite.cpp
+        test_suites/BytecodeLexerTestSuite.cpp
+        test_suites/BytecodeParserTestSuite.cpp
+        test_suites/BuiltinTestSuite.cpp
+        bytecode_lexer_tests.cpp
+        bytecode_parser_tests.cpp
+        bytecode_commands_tests.cpp
+        builtin_functions_tests.cpp
+        jit_tests.cpp
+)
+else()
 add_executable(
         ${PROJECT_NAME}_tests
         main_test.cpp
@@ -15,6 +34,7 @@ add_executable(
         gc_tests.cpp
         test_suites/GcTestSuite.cpp
 )
+endif()
 
 target_link_libraries(
         ${PROJECT_NAME}_tests

tests/jit_tests.cpp

@@ -0,0 +1,18 @@
+
+#include <gtest/gtest.h>
+
+#include "lib/vm_ui/vm_ui_functions.hpp"
+#include "test_functions.hpp"
+#include "test_suites/X64JitTestSuite.hpp"
+
+TEST_F(X64JitTestSuite, Test1) {
+  RunSingleTest(JitTestData{
+      .test_name = "jit-float-test.oil",
+      .arguments = "",
+      .input = "",
+      .expected_output = "",
+      .expected_error = "",
+      .expected_return_code = 0,
+      .jit_action_bound = 1,
+  });
+}

tests/test_data/examples

@@ -14,10 +14,11 @@
 #include "lib/execution_tree/Block.hpp"
 #include "lib/execution_tree/FunctionRepository.hpp"
 #include "lib/execution_tree/IFunctionExecutable.hpp"
-#include "lib/executor/PlaceholderJitExecutorFactory.hpp"
 #include "lib/runtime/RuntimeMemory.hpp"
 #include "lib/runtime/VirtualTableRepository.hpp"
 
+#include "lib/executor/PlaceholderJitExecutorFactory.hpp"
+
 struct BytecodeParserTestSuite : public testing::Test {
   static constexpr size_t kJitBoundary = 10;
   void SetUp() override;

tests/test_suites/BytecodeParserTestSuite.hpp

@@ -0,0 +1,39 @@
+#include "X64JitTestSuite.hpp"
+
+#include <filesystem>
+
+#include "lib/vm_ui/vm_ui_functions.hpp"
+#include "tests/test_functions.hpp"
+
+void X64JitTestSuite::SetUp() {
+  std::filesystem::create_directories(kTemporaryDirectoryName);
+}
+
+void X64JitTestSuite::TearDown() {
+  std::filesystem::remove_all(kTemporaryDirectoryName);
+}
+
+void X64JitTestSuite::RunSingleTest(const JitTestData& test_data) const {
+  std::filesystem::path test_file = kTestDataDir;
+  test_file /= "examples";
+  test_file /= "compiled";
+  test_file /= "jit";
+  test_file /= test_data.test_name;
+  std::string cmd = "ovum-vm -f \"";
+  cmd += test_file.string();
+  cmd += "\"";
+  cmd += " -j ";
+  cmd += std::to_string(test_data.jit_action_bound);
+
+  if (!test_data.arguments.empty()) {
+    cmd += " -- ";
+    cmd += test_data.arguments;
+  }
+
+  std::istringstream in(test_data.input);
+  std::ostringstream out;
+  std::ostringstream err;
+  ASSERT_EQ(StartVmConsoleUI(SplitString(cmd), std::cout, in, std::cout), test_data.expected_return_code);
+  ASSERT_EQ(out.str(), test_data.expected_output);
+  ASSERT_EQ(err.str(), test_data.expected_error);
+}

tests/test_suites/X64JitTestSuite.cpp

@@ -0,0 +1,29 @@
+#ifndef X64JITTESTSUITE_HPP_
+#define X64JITTESTSUITE_HPP_
+
+#include <string>
+
+#include <gtest/gtest.h>
+
+struct JitTestData {
+  std::string test_name;
+  std::string arguments;
+  std::string input;
+  std::string expected_output;
+  std::string expected_error;
+  int32_t expected_return_code = 0;
+  uint64_t jit_action_bound = 0;
+};
+
+struct X64JitTestSuite : public testing::Test { // special test structure
+  const std::string kTemporaryDirectoryName = "./gtest_tmp";
+  const std::string kTestDataDir = TEST_DATA_DIR;
+
+  void SetUp() override; // method that is called at the beginning of every test
+
+  void TearDown() override; // method that is called at the end of every test
+
+  void RunSingleTest(const JitTestData& test_data) const;
+};
+
+#endif // X64JITTESTSUITE_HPP_