diff --git a/.github/odbc/odbc.ini b/.github/odbc/odbc.ini index c8b54abdb..90bf4b17a 100644 --- a/.github/odbc/odbc.ini +++ b/.github/odbc/odbc.ini @@ -33,7 +33,7 @@ Driver = SQLite Driver Database = /tmp/test Timeout = 2000 -[MicrosoftSQLServer] +[SQLServer] Driver = ODBC Driver 17 for SQL Server Server = localhost Port = 1433 diff --git a/revdep-dev/Makefile b/revdep-dev/Makefile index 0fd87cfd2..dd99aa644 100644 --- a/revdep-dev/Makefile +++ b/revdep-dev/Makefile @@ -36,7 +36,7 @@ test-%: install % @echo @echo "\033[1m=== $* ===\033[0m" @echo - DBITEST_BACKENDS=true Rscript -e 'target <- "$*"; if (grepl(".*-.*", target)) { pkg <- sub("-.*", "", target); filter <- sub(".*-", "", target); Sys.setenv(ODBC_CS = paste0("dsn=", filter)) } else { pkg <- target; filter <- "DBItest" }; options(crayon.enabled = TRUE); pkgload::load_all(".."); testthat::test_local(pkg, filter = filter, stop_on_failure = TRUE, reporter = '"${TESTTHAT_REPORTER}"')' + DBITEST_BACKENDS=true Rscript -e 'target <- "$*"; if (grepl(".*-.*", target)) { pkg <- sub("-.*", "", target); filter <- sub(".*-", "", target); cs <- paste0("dsn=", filter); if (filter == "SQLServer") cs <- paste0(cs, ";UID=SA;PWD=Password12"); Sys.setenv(ODBC_CS = cs) } else { pkg <- target; filter <- "DBItest" }; options(crayon.enabled = TRUE); pkgload::load_all(".."); testthat::test_local(pkg, filter = filter, stop_on_failure = TRUE, reporter = '"${TESTTHAT_REPORTER}"')' clean: rm -rf ${REVDEP}