diff --git a/build.sbt b/build.sbt index 8878032c76ce..5c0028a5b9dc 100644 --- a/build.sbt +++ b/build.sbt @@ -3787,7 +3787,12 @@ lazy val `engine-runner` = project `base-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++ `image-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++ `table-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++ - `database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) + `database-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++ + `std-aws-polyglot-root`.listFiles("*.jar").map(_.getAbsolutePath()) ++ + `std-microsoft-polyglot-root` + .listFiles("*.jar") + .map(_.getAbsolutePath()) + core ++ stdLibsJars }, buildSmallJdk := { @@ -3905,7 +3910,8 @@ lazy val `engine-runner` = project "org.enso.image", "org.enso.table", "org.enso.database", - "org.eclipse.jgit" + "org.eclipse.jgit", + "com.amazonaws" ) ) } diff --git a/build_tools/build/src/engine/context.rs b/build_tools/build/src/engine/context.rs index 1d9bb9557a24..bbaabfbc2659 100644 --- a/build_tools/build/src/engine/context.rs +++ b/build_tools/build/src/engine/context.rs @@ -702,6 +702,18 @@ pub async fn runner_sanity_test( .run_ok() .await; + let test_aws = Command::new(&enso) + .args(["--run", repo_root.test.join("AWS_Tests").as_str()]) + .set_env(ENSO_DATA_DIRECTORY, engine_package)? + .run_ok() + .await; + + let test_microsoft = Command::new(&enso) + .args(["--run", repo_root.test.join("Microsoft_Tests").as_str()]) + .set_env(ENSO_DATA_DIRECTORY, engine_package)? + .run_ok() + .await; + let test_geo = Command::new(&enso) .args(["--run", repo_root.test.join("Geo_Tests").as_str()]) .set_env(ENSO_DATA_DIRECTORY, engine_package)? @@ -714,7 +726,7 @@ pub async fn runner_sanity_test( .run_ok() .await; - let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_geo).and(test_image); + let all_cmds = test_base.and(test_internal_base).and(test_table).and(test_aws).and(test_microsoft).and(test_geo).and(test_image); // The following test does not actually run anything, it just checks if the engine // can accept `--jvm` argument and evaluates something. diff --git a/std-bits/microsoft/src/main/resources/META-INF/native-image/org/enso/microsoft/resource-config.json b/std-bits/microsoft/src/main/resources/META-INF/native-image/org/enso/microsoft/resource-config.json new file mode 100644 index 000000000000..ef3099149de5 --- /dev/null +++ b/std-bits/microsoft/src/main/resources/META-INF/native-image/org/enso/microsoft/resource-config.json @@ -0,0 +1,9 @@ +{ + "resources":{ + "includes":[{ + "pattern":"\\QMETA-INF/java.sql.Driver\\E" + }]}, + "bundles":[{ + "name": "com.microsoft.sqlserver.jdbc.SQLServerResource" + }] +} diff --git a/test/Microsoft_Tests/README.md b/test/Microsoft_Tests/README.md index 6fd823f01fd9..cead4ad918e5 100644 --- a/test/Microsoft_Tests/README.md +++ b/test/Microsoft_Tests/README.md @@ -10,7 +10,7 @@ Please set the following environment variables: - 'ENSO_SQLSERVER_HOST' - the name of the server hosting SQLServer, - 'ENSO_SQLSERVER_PORT' - the port SQLServer is on, - 'ENSO_SQLSERVER_USER' - the user name to use to connect, -- 'ENSO_SQLSERVER_PASSWORD' - the pasword for that user, +- 'ENSO_SQLSERVER_PASSWORD' - the password for that user, - 'ENSO_SQLSERVER_DATABASE' - the database on the SQLServer to use. ## Docker