From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- config/tests/src-simple/Makefile.in | 38 ++++++++++++++++++++++ config/tests/src-simple/jar.mn | 22 +++++++++++++ config/tests/src-simple/l10n/l10nfile.txt | 1 + config/tests/src-simple/moz.build | 7 ++++ config/tests/src-simple/thesrcdir/file.xml | 1 + config/tests/src-simple/thesrcdir/preproc.in | 6 ++++ config/tests/src-simple/thesrcdir/some.css | 6 ++++ config/tests/src-simple/thetopsrcdir/otherfile.xml | 1 + 8 files changed, 82 insertions(+) create mode 100644 config/tests/src-simple/Makefile.in create mode 100644 config/tests/src-simple/jar.mn create mode 100644 config/tests/src-simple/l10n/l10nfile.txt create mode 100644 config/tests/src-simple/moz.build create mode 100644 config/tests/src-simple/thesrcdir/file.xml create mode 100644 config/tests/src-simple/thesrcdir/preproc.in create mode 100644 config/tests/src-simple/thesrcdir/some.css create mode 100644 config/tests/src-simple/thetopsrcdir/otherfile.xml (limited to 'config/tests/src-simple') diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in new file mode 100644 index 0000000000..7d3065a17a --- /dev/null +++ b/config/tests/src-simple/Makefile.in @@ -0,0 +1,38 @@ +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +LOCALE_SRCDIR = $(srcdir)/l10n + +EXTERNALLY_MANAGED_MAKE_FILE := 1 +STANDALONE_MAKEFILE := 1 +JAR_MANIFEST := $(srcdir)/jar.mn + +include $(topsrcdir)/config/config.mk + +XPI_NAME = test_jar_mn + +ACDEFINES += \ + -DAB_CD=ab-X-stuff \ + $(NULL) + +MY_MANIFEST = $(if $(USE_EXTENSION_MANIFEST), $(FINAL_TARGET)/chrome.manifest, $(FINAL_TARGET)/chrome/test.manifest) +REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest) + +check-%:: + if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; + $(MAKE) realchrome MOZ_JAR_MAKER_FILE_FORMAT=$* + @echo 'Comparing manifests...' + @if ! diff --text -U 0 $(MY_MANIFEST) $(srcdir)/../$(REF_MANIFEST).$* ; then \ + echo 'TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!' ; \ + false; \ + fi + @if [ $* = 'jar' ]; then \ + $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \ + fi + @echo 'Comparing packages...' + @if ! diff -ur $(srcdir)/../ref-simple $(FINAL_TARGET)/chrome/test ; then\ + echo 'TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar' ; \ + false; \ + fi diff --git a/config/tests/src-simple/jar.mn b/config/tests/src-simple/jar.mn new file mode 100644 index 0000000000..12ed607b66 --- /dev/null +++ b/config/tests/src-simple/jar.mn @@ -0,0 +1,22 @@ +#filter substitution + +test.jar: +# test chrome with flags and path expansion +% content test %one +# test locale with variable substitution and path expansion +% locale @AB_CD@ %three +# test overlays +% overlay chrome://one/file.xml chrome://two/otherfile.xml +# test regular file, preprocessed file, preprocessed css + one/file.xml (thesrcdir/file.xml) +* one/preproc (thesrcdir/preproc.in) +* one/some.css (thesrcdir/some.css) +# test reference against topsrcdir + two/otherfile.xml (/config/tests/src-simple/thetopsrcdir/otherfile.xml) +# test reference against localesrcdir + three/l10nfile.txt (%l10nfile.txt) + +test.jar: +# test manifest update the locale one was already added above, add skin +% locale @AB_CD@ %three +% skin test classic %one diff --git a/config/tests/src-simple/l10n/l10nfile.txt b/config/tests/src-simple/l10n/l10nfile.txt new file mode 100644 index 0000000000..7ce7909abf --- /dev/null +++ b/config/tests/src-simple/l10n/l10nfile.txt @@ -0,0 +1 @@ +localized content diff --git a/config/tests/src-simple/moz.build b/config/tests/src-simple/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/config/tests/src-simple/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ["jar.mn"] diff --git a/config/tests/src-simple/thesrcdir/file.xml b/config/tests/src-simple/thesrcdir/file.xml new file mode 100644 index 0000000000..21aacb9bd6 --- /dev/null +++ b/config/tests/src-simple/thesrcdir/file.xml @@ -0,0 +1 @@ + diff --git a/config/tests/src-simple/thesrcdir/preproc.in b/config/tests/src-simple/thesrcdir/preproc.in new file mode 100644 index 0000000000..16d5024182 --- /dev/null +++ b/config/tests/src-simple/thesrcdir/preproc.in @@ -0,0 +1,6 @@ +# This would be an processed out +# pretty lengthy +# license header. +# For example. + +#expand This is __AB_CD__. diff --git a/config/tests/src-simple/thesrcdir/some.css b/config/tests/src-simple/thesrcdir/some.css new file mode 100644 index 0000000000..36171b4bba --- /dev/null +++ b/config/tests/src-simple/thesrcdir/some.css @@ -0,0 +1,6 @@ +#div: { +/* this is a ID rule, and should stay intact */ +} +%expand [lang=__AB_CD__] { +/* this selector should match content with lang="ab-X-stuff" */ +} diff --git a/config/tests/src-simple/thetopsrcdir/otherfile.xml b/config/tests/src-simple/thetopsrcdir/otherfile.xml new file mode 100644 index 0000000000..6c50abf6fc --- /dev/null +++ b/config/tests/src-simple/thetopsrcdir/otherfile.xml @@ -0,0 +1 @@ + -- cgit v1.2.3