diff --git a/Base/usr/share/man/man1/test-js.md b/Base/usr/share/man/man1/test-js.md index a6e9f728c4..24f1426590 100644 --- a/Base/usr/share/man/man1/test-js.md +++ b/Base/usr/share/man/man1/test-js.md @@ -10,13 +10,13 @@ $ test-js [options...] [path] ## Description -`test-js` runs the LibJS test suite located in `/home/anon/js-tests`. These +`test-js` runs the LibJS test suite located in `/home/anon/Test/js-tests`. These tests are using a custom JavaScript testing framework inspired by -[Jest](https://jestjs.io) (see [`test-common.js`](/home/anon/js-tests/test-common.js)). +[Jest](https://jestjs.io) (see [`test-common.js`](/home/anon/Tests/js-tests/test-common.js)). It also supports the [test262 parser tests](https://github.com/tc39/test262-parser-tests). -The test root directory is assumed to be `/home/anon/js-tests`, or `$SERENITY_SOURCE_DIR/Userland/Libraries/LibJS/Tests` +The test root directory is assumed to be `/home/anon/Tests/js-tests`, or `$SERENITY_SOURCE_DIR/Userland/Libraries/LibJS/Tests` when using the Lagom build. Optionally you can pass a custom path to `test-js` to override these defaults. You can disable output from `dbgln()` calls by setting the `DISABLE_DBG_OUTPUT` environment variable. diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index b7652f1470..88a94d9e18 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -155,17 +155,17 @@ mkdir -p mnt/home/anon mkdir -p mnt/home/anon/Desktop mkdir -p mnt/home/anon/Downloads mkdir -p mnt/home/nona -rm -fr mnt/home/anon/js-tests mnt/home/anon/web-tests mnt/home/anon/Tests/cpp-tests mnt/home/anon/wasm-tests +rm -fr mnt/home/anon/Tests/js-tests mnt/home/anon/Tests/web-tests mnt/home/anon/Tests/cpp-tests mnt/home/anon/Tests/wasm-tests mkdir -p mnt/home/anon/Tests/cpp-tests/ cp "$SERENITY_SOURCE_DIR"/README.md mnt/home/anon/ -cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibJS/Tests mnt/home/anon/js-tests -cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibWeb/Tests mnt/home/anon/web-tests +cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibJS/Tests mnt/home/anon/Tests/js-tests +cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibWeb/Tests mnt/home/anon/Tests/web-tests cp -r "$SERENITY_SOURCE_DIR"/Userland/DevTools/HackStudio/LanguageServers/Cpp/Tests mnt/home/anon/Tests/cpp-tests/comprehension cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibCpp/Tests/parser mnt/home/anon/Tests/cpp-tests/parser cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibCpp/Tests/preprocessor mnt/home/anon/Tests/cpp-tests/preprocessor -cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibWasm/Tests mnt/home/anon/wasm-tests -cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibJS/Tests/test-common.js mnt/home/anon/wasm-tests -cp -r "$SERENITY_SOURCE_DIR"/Userland/Applications/Spreadsheet/Tests mnt/home/anon/spreadsheet-tests +cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibWasm/Tests mnt/home/anon/Tests/wasm-tests +cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibJS/Tests/test-common.js mnt/home/anon/Tests/wasm-tests +cp -r "$SERENITY_SOURCE_DIR"/Userland/Applications/Spreadsheet/Tests mnt/home/anon/Tests/spreadsheet-tests if [ -n "$SERENITY_COPY_SOURCE" ] ; then printf "\ncopying Serenity's source... " diff --git a/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp b/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp index 7dc4027aaa..7b5bc0df75 100644 --- a/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp +++ b/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp @@ -141,7 +141,7 @@ int main(int argc, char** argv) test_root = String { specified_test_root }; } else { #ifdef __serenity__ - test_root = LexicalPath::join("/home/anon", String::formatted("{}-tests", program_name.split_view('-').last())).string(); + test_root = LexicalPath::join("/home/anon/Tests", String::formatted("{}-tests", program_name.split_view('-').last())).string(); #else char* serenity_source_dir = getenv("SERENITY_SOURCE_DIR"); if (!serenity_source_dir) { @@ -159,7 +159,7 @@ int main(int argc, char** argv) if (common_path.is_empty()) { #ifdef __serenity__ - common_path = "/home/anon/js-tests/test-common.js"; + common_path = "/home/anon/Tests/js-tests/test-common.js"; #else char* serenity_source_dir = getenv("SERENITY_SOURCE_DIR"); if (!serenity_source_dir) { diff --git a/Userland/Utilities/markdown-check.cpp b/Userland/Utilities/markdown-check.cpp index e9ec81b1e7..50020c83c0 100644 --- a/Userland/Utilities/markdown-check.cpp +++ b/Userland/Utilities/markdown-check.cpp @@ -41,7 +41,7 @@ static bool is_missing_file_acceptable(String const& filename) "/usr/share/man/man2/ptrace.md", "/usr/share/man/man5/perfcore.md", // These ones are okay: - "/home/anon/js-tests/test-common.js", + "/home/anon/Tests/js-tests/test-common.js", "/man1/index.html", "/man2/index.html", "/man3/index.html",