This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit b281011e893e7590308baf877d307372d85f5327 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Feb 2 15:46:49 2026 -0800 RoyaleUnit tests: continue to use env.FLASHPLAYER_DEBUGGER, if available, but add fall back to AIR SDK adl when not --- frameworks/projects/Basic/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/Binding/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/Collections/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/Core/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/MXRoyaleBase/src/test/royale/build.xml | 14 ++++++++++---- frameworks/projects/Network/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/Reflection/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/RoyaleUnit/src/test/royale/build.xml | 13 ++++++++++++- frameworks/projects/XML/src/test/royale/build.xml | 12 +++++++++--- 9 files changed, 103 insertions(+), 14 deletions(-) diff --git a/frameworks/projects/Basic/src/test/royale/build.xml b/frameworks/projects/Basic/src/test/royale/build.xml index ba61860559..1ea9b594ad 100644 --- a/frameworks/projects/Basic/src/test/royale/build.xml +++ b/frameworks/projects/Basic/src/test/royale/build.xml @@ -92,7 +92,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/Binding/src/test/royale/build.xml b/frameworks/projects/Binding/src/test/royale/build.xml index fcbeb2b1bc..fb72d59a12 100644 --- a/frameworks/projects/Binding/src/test/royale/build.xml +++ b/frameworks/projects/Binding/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/Collections/src/test/royale/build.xml b/frameworks/projects/Collections/src/test/royale/build.xml index 8e53ca16cf..60d761643c 100644 --- a/frameworks/projects/Collections/src/test/royale/build.xml +++ b/frameworks/projects/Collections/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml index e52be0955f..b6a8ed4293 100644 --- a/frameworks/projects/Core/src/test/royale/build.xml +++ b/frameworks/projects/Core/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml b/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml index f8fc2b8485..74d831512f 100644 --- a/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml +++ b/frameworks/projects/MXRoyaleBase/src/test/royale/build.xml @@ -101,12 +101,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <!-- Use the env var if it is set, otherwise default to 'system' flash debugger --> - <condition property="command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> <isset property="env.FLASHPLAYER_DEBUGGER" /> </condition> - <royaleunit - command="${command}" + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/Network/src/test/royale/build.xml b/frameworks/projects/Network/src/test/royale/build.xml index 881f9cb289..f294b5b84c 100644 --- a/frameworks/projects/Network/src/test/royale/build.xml +++ b/frameworks/projects/Network/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/Reflection/src/test/royale/build.xml b/frameworks/projects/Reflection/src/test/royale/build.xml index 25e9f6fed3..bb694290e1 100644 --- a/frameworks/projects/Reflection/src/test/royale/build.xml +++ b/frameworks/projects/Reflection/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml index 0549cf8c22..defbcb491a 100644 --- a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml +++ b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml @@ -97,7 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <royaleunit + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + + <royaleunit + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}" diff --git a/frameworks/projects/XML/src/test/royale/build.xml b/frameworks/projects/XML/src/test/royale/build.xml index 4eb47030ad..014dfe1f50 100644 --- a/frameworks/projects/XML/src/test/royale/build.xml +++ b/frameworks/projects/XML/src/test/royale/build.xml @@ -97,12 +97,18 @@ <!-- because targets that run before royaleUnitTasks.jar gets built would fail. --> <taskdef resource="royaleUnitTasks.tasks" classpathref="royaleunit.lib.path"/> <mkdir dir="${report.dir}" /> - <!-- Use the env var if it is set, otherwise default to 'system' flash debugger --> - <condition property="command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + + <!-- If the FLASHPLAYER_DEBUGGER is set, use it. Otherwise, prefer ADL from AIR_HOME. --> + <condition property="royaleunit.command" value="${env.FLASHPLAYER_DEBUGGER}" else=""> + <isset property="env.FLASHPLAYER_DEBUGGER" /> + </condition> + <condition property="royaleunit.player" value="flash" else="air"> <isset property="env.FLASHPLAYER_DEBUGGER" /> </condition> + <royaleunit - command="${command}" + command="${royaleunit.command}" + player="${royaleunit.player}" swf="${basedir}/FlexUnitRoyaleApplication.swf" workingDir="${basedir}" toDir="${report.dir}"
