This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new b059c9359b Remove unnecessary bootclasspath.prepend and reenable CI/CD tests for html.editor new 57e480a874 Merge pull request #5162 from matthiasblaesing/remove_bootclasspath_prepend b059c9359b is described below commit b059c9359bdc377ba10b63103ba0faed119a5209 Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Thu Dec 29 16:28:31 2022 +0100 Remove unnecessary bootclasspath.prepend and reenable CI/CD tests for html.editor --- .github/workflows/main.yml | 4 ++-- ide/html.editor/nbproject/project.properties | 2 -- ide/html.editor/test/unit/data/testfiles/simple01.html.formatted | 6 ++++-- ide/html.editor/test/unit/data/testfiles/simple07.html.formatted | 2 +- .../org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java | 2 +- php/php.latte/nbproject/project.properties | 2 -- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc6e71dbb5..b3940ad121 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -481,8 +481,8 @@ jobs: - name: ide/html.custom run: ant $OPTS -f ide/html.custom test -# - name: ide/html.editor -# run: ant $OPTS -f ide/html.editor test + - name: ide/html.editor + run: ant $OPTS -f ide/html.editor test # - name: ide/html.lexer # run: ant $OPTS -f ide/html.lexer test diff --git a/ide/html.editor/nbproject/project.properties b/ide/html.editor/nbproject/project.properties index 933ce17a05..221d2e3f1b 100644 --- a/ide/html.editor/nbproject/project.properties +++ b/ide/html.editor/nbproject/project.properties @@ -27,5 +27,3 @@ test.config.stableBTD.excludes=\ **/Html5CompletionQueryTest.class,\ **/NavigationSideBarTest.class,\ **/HtmlIndenterTest.class -nashorn.prepend=${basedir}/../libs.nashorn/external/nashorn-02f810c26ff9-patched.jar -bootclasspath.prepend=${nashorn.prepend}${path.separator}${basedir}/../libs.nashorn/external/asm-all-4.0.jar diff --git a/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted b/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted index e20b844413..696b88ba84 100644 --- a/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted +++ b/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted @@ -5,7 +5,7 @@ http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <style type="text/css"> - Q:lang(en){ + Q:lang(en){ /* my own comment @@ -16,7 +16,9 @@ } </style> <style type="text/css"> - .error {color:red;} + .error { + color:red; + } </style> </head> <body> diff --git a/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted b/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted index 0239635fc4..773a359661 100644 --- a/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted +++ b/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted @@ -1,2 +1,2 @@ <table -</table> + </table> diff --git a/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java b/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java index 2cb106b406..d241e10d13 100644 --- a/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java +++ b/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java @@ -183,7 +183,7 @@ public class HtmlIndenterTest extends TestBase2 { } public void testFormattingHTML07() throws Exception { - // #198659 + // #198659 - checks that indention works without assertion in MarkupAbstractIndenter reformatFileContents("testfiles/simple07.html",new IndentPrefs(4,4)); } diff --git a/php/php.latte/nbproject/project.properties b/php/php.latte/nbproject/project.properties index 2aaf46bb91..0f4ec98bc9 100644 --- a/php/php.latte/nbproject/project.properties +++ b/php/php.latte/nbproject/project.properties @@ -16,5 +16,3 @@ # under the License. javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -nashorn.prepend=${basedir}/../libs.nashorn/external/nashorn-02f810c26ff9-patched.jar -bootclasspath.prepend=${nashorn.prepend}${path.separator}${basedir}/../libs.nashorn/external/asm-all-4.0.jar --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists