diff options
Diffstat (limited to 'tools/update-packaging/test')
106 files changed, 0 insertions, 682 deletions
diff --git a/tools/update-packaging/test/buildrefmars.sh b/tools/update-packaging/test/buildrefmars.sh deleted file mode 100755 index fd2d5384d..000000000 --- a/tools/update-packaging/test/buildrefmars.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Builds all the reference mars - -if [ -f "ref.mar" ]; then - rm "ref.mar" -fi -if [ -f "ref-mac.mar" ]; then - rm "ref-mac.mar" -fi - - ../make_incremental_update.sh ref.mar `pwd`/from `pwd`/to - ../make_incremental_update.sh ref-mac.mar `pwd`/from-mac `pwd`/to-mac - -if [ -f "product-1.0.lang.platform.complete.mar" ]; then - rm "product-1.0.lang.platform.complete.mar" -fi -if [ -f "product-2.0.lang.platform.complete.mar" ]; then - rm "product-2.0.lang.platform.complete.mar" -fi -if [ -f "product-2.0.lang.mac.complete.mar" ]; then - rm "product-2.0.lang.mac.complete.mar" -fi - -./make_full_update.sh product-1.0.lang.platform.complete.mar "`pwd`/from" -./make_full_update.sh product-2.0.lang.platform.complete.mar "`pwd`/to" -./make_full_update.sh product-1.0.lang.mac.complete.mar "`pwd`/from-mac" -./make_full_update.sh product-2.0.lang.mac.complete.mar "`pwd`/to-mac" diff --git a/tools/update-packaging/test/catmanifest.sh b/tools/update-packaging/test/catmanifest.sh deleted file mode 100755 index 354c3ff41..000000000 --- a/tools/update-packaging/test/catmanifest.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# helper tool for testing. Cats the manifest out of a mar file - -mar="$1" -workdir="/tmp/catmanifest" - -rm -rf "$workdir" -mkdir -p "$workdir" -cp "$1" "$workdir" -cd "$workdir" -mar -x "$1" -mv updatev2.manifest updatev2.manifest.bz2 -bzip2 -d updatev2.manifest.bz2 -cat updatev2.manifest diff --git a/tools/update-packaging/test/common.sh b/tools/update-packaging/test/common.sh deleted file mode 100755 index 7c133724e..000000000 --- a/tools/update-packaging/test/common.sh +++ /dev/null @@ -1,202 +0,0 @@ -#!/bin/bash -# 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/. - -# -# Code shared by update packaging scripts. -# Author: Darin Fisher -# -# In here to use the local common.sh to allow the full mars to have unfiltered files - -# ----------------------------------------------------------------------------- -# By default just assume that these tools exist on our path -MAR=${MAR:-mar} -BZIP2=${BZIP2:-bzip2} -MBSDIFF=${MBSDIFF:-mbsdiff} - -# ----------------------------------------------------------------------------- -# Helper routines - -notice() { - echo "$*" 1>&2 -} - -get_file_size() { - info=($(ls -ln "$1")) - echo ${info[4]} -} - -copy_perm() { - reference="$1" - target="$2" - - if [ -x "$reference" ]; then - chmod 0755 "$target" - else - chmod 0644 "$target" - fi -} - -make_add_instruction() { - f="$1" - filev2="$2" - # The third param will be an empty string when a file add instruction is only - # needed in the version 2 manifest. This only happens when the file has an - # add-if-not instruction in the version 3 manifest. This is due to the - # precomplete file prior to the version 3 manifest having a remove instruction - # for this file so the file is removed before applying a complete update. - filev3="$3" - - # Used to log to the console - if [ $4 ]; then - forced=" (forced)" - else - forced= - fi - - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/') - notice " add-if \"$testdir\" \"$f\"" - echo "add-if \"$testdir\" \"$f\"" >> $filev2 - if [ ! $filev3 = "" ]; then - echo "add-if \"$testdir\" \"$f\"" >> $filev3 - fi - else - notice " add \"$f\"$forced" - echo "add \"$f\"" >> $filev2 - if [ ! $filev3 = "" ]; then - echo "add \"$f\"" >> $filev3 - fi - fi -} - -check_for_add_if_not_update() { - add_if_not_file_chk="$1" - - if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \ - `basename $add_if_not_file_chk` = "update-settings.ini" ]; then - ## "true" *giggle* - return 0; - fi - ## 'false'... because this is bash. Oh yay! - return 1; -} - -check_for_add_to_manifestv2() { - add_if_not_file_chk="$1" - - if [ `basename $add_if_not_file_chk` = "update-settings.ini" ]; then - ## "true" *giggle* - return 0; - fi - ## 'false'... because this is bash. Oh yay! - return 1; -} - -make_add_if_not_instruction() { - f="$1" - filev3="$2" - - notice " add-if-not \"$f\" \"$f\"" - echo "add-if-not \"$f\" \"$f\"" >> $filev3 -} - -make_patch_instruction() { - f="$1" - filev2="$2" - filev3="$3" - - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/') - notice " patch-if \"$testdir\" \"$f.patch\" \"$f\"" - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev2 - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev3 - else - notice " patch \"$f.patch\" \"$f\"" - echo "patch \"$f.patch\" \"$f\"" >> $filev2 - echo "patch \"$f.patch\" \"$f\"" >> $filev3 - fi -} - -append_remove_instructions() { - dir="$1" - filev2="$2" - filev3="$3" - - if [ -f "$dir/removed-files" ]; then - listfile="$dir/removed-files" - elif [ -f "$dir/Contents/Resources/removed-files" ]; then - listfile="$dir/Contents/Resources/removed-files" - fi - if [ -n "$listfile" ]; then - # Map spaces to pipes so that we correctly handle filenames with spaces. - files=($(cat "$listfile" | tr " " "|" | sort -r)) - num_files=${#files[*]} - for ((i=0; $i<$num_files; i=$i+1)); do - # Map pipes back to whitespace and remove carriage returns - f=$(echo ${files[$i]} | tr "|" " " | tr -d '\r') - # Trim whitespace - f=$(echo $f) - # Exclude blank lines. - if [ -n "$f" ]; then - # Exclude comments - if [ ! $(echo "$f" | grep -c '^#') = 1 ]; then - if [ $(echo "$f" | grep -c '\/$') = 1 ]; then - notice " rmdir \"$f\"" - echo "rmdir \"$f\"" >> $filev2 - echo "rmdir \"$f\"" >> $filev3 - elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then - # Remove the * - f=$(echo "$f" | sed -e 's:\*$::') - notice " rmrfdir \"$f\"" - echo "rmrfdir \"$f\"" >> $filev2 - echo "rmrfdir \"$f\"" >> $filev3 - else - notice " remove \"$f\"" - echo "remove \"$f\"" >> $filev2 - echo "remove \"$f\"" >> $filev3 - fi - fi - fi - done - fi -} - -# List all files in the current directory, stripping leading "./" -# Pass a variable name and it will be filled as an array. -list_files() { - count=0 - - # Removed the exclusion cases here to allow for generation of testing mars - find . -type f \ - | sed 's/\.\/\(.*\)/\1/' \ - | sort -r > "$workdir/temp-filelist" - while read file; do - eval "${1}[$count]=\"$file\"" - (( count++ )) - done < "$workdir/temp-filelist" - rm "$workdir/temp-filelist" -} - -# List all directories in the current directory, stripping leading "./" -list_dirs() { - count=0 - - find . -type d \ - ! -name "." \ - ! -name ".." \ - | sed 's/\.\/\(.*\)/\1/' \ - | sort -r > "$workdir/temp-dirlist" - while read dir; do - eval "${1}[$count]=\"$dir\"" - (( count++ )) - done < "$workdir/temp-dirlist" - rm "$workdir/temp-dirlist" -} diff --git a/tools/update-packaging/test/diffmar.sh b/tools/update-packaging/test/diffmar.sh deleted file mode 100755 index 771b6b0ce..000000000 --- a/tools/update-packaging/test/diffmar.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# Compares two mars - -marA="$1" -marB="$2" -testDir="$3" -workdir="/tmp/diffmar/$testDir" -fromdir="$workdir/0" -todir="$workdir/1" - -# On Windows, creation time can be off by a second or more between the files in -# the fromdir and todir due to them being extracted synchronously so use -# time-style and exclude seconds from the creation time. -lsargs="-algR" -unamestr=`uname` -if [ ! "$unamestr" = 'Darwin' ]; then - unamestr=`uname -o` - if [ "$unamestr" = 'Msys' -o "$unamestr" = "Cygwin" ]; then - lsargs="-algR --time-style=+%Y-%m-%d-%H:%M" - fi -fi - -rm -rf "$workdir" -mkdir -p "$fromdir" -mkdir -p "$todir" - -cp "$1" "$fromdir" -cp "$2" "$todir" - -cd "$fromdir" -mar -x "$1" -rm "$1" -mv updatev2.manifest updatev2.manifest.bz2 -bzip2 -d updatev2.manifest.bz2 -mv updatev3.manifest updatev3.manifest.bz2 -bzip2 -d updatev3.manifest.bz2 -ls $lsargs > files.txt - -cd "$todir" -mar -x "$2" -rm "$2" -mv updatev2.manifest updatev2.manifest.bz2 -bzip2 -d updatev2.manifest.bz2 -mv updatev3.manifest updatev3.manifest.bz2 -bzip2 -d updatev3.manifest.bz2 -ls $lsargs > files.txt - -echo "diffing $fromdir and $todir" -echo "on linux shell sort and python sort return different results" -echo "which can cause differences in the manifest files" -diff -ru "$fromdir" "$todir" diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/force.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt deleted file mode 100644 index 2c3f0b340..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt +++ /dev/null @@ -1 +0,0 @@ -removed diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/same.bin b/tools/update-packaging/test/from-mac/Contents/MacOS/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/update.manifest b/tools/update-packaging/test/from-mac/Contents/MacOS/update.manifest deleted file mode 100644 index d3e8ed851..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/update.manifest +++ /dev/null @@ -1 +0,0 @@ -from file shouldn't go in update diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/readme.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/readme.txt deleted file mode 100644 index d7c40c63c..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This from file should be ignored diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/removed.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/removed.txt deleted file mode 100644 index 2c3f0b340..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/removed.txt +++ /dev/null @@ -1 +0,0 @@ -removed diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.bin b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.txt b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/update.manifest b/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/update.manifest deleted file mode 100644 index d3e8ed851..000000000 --- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/update.manifest +++ /dev/null @@ -1 +0,0 @@ -from file shouldn't go in update diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/application.ini b/tools/update-packaging/test/from-mac/Contents/Resources/application.ini deleted file mode 100644 index 942e91a16..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/application.ini +++ /dev/null @@ -1,5 +0,0 @@ -[App] -Vendor=Mozilla -Name=MarTest -Version=1 -BuildID=20120101010101 diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/precomplete b/tools/update-packaging/test/from-mac/Contents/Resources/precomplete deleted file mode 100644 index 2d9068d37..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/precomplete +++ /dev/null @@ -1,26 +0,0 @@ -remove "Contents/MacOS/{foodir/update.manifest" -remove "Contents/MacOS/{foodir/same.txt" -remove "Contents/MacOS/{foodir/same.bin" -remove "Contents/MacOS/{foodir/removed.txt" -remove "Contents/MacOS/{foodir/readme.txt" -remove "Contents/MacOS/{foodir/force.txt" -remove "Contents/MacOS/{foodir/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/update.manifest" -remove "Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/same.txt" -remove "Contents/MacOS/same.bin" -remove "Contents/MacOS/removed.txt" -remove "Contents/MacOS/readme.txt" -remove "Contents/MacOS/force.txt" -remove "Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/application.ini" -remove "Contents/Resources/precomplete" -rmdir "Contents/MacOS/{foodir/" -rmdir "Contents/MacOS/searchplugins/diff/" -rmdir "Contents/MacOS/searchplugins/" -rmdir "Contents/MacOS/extensions/diff/" -rmdir "Contents/MacOS/extensions/" -rmdir "Contents/MacOS/" -rmdir "Contents/Resources/" -rmdir "Contents/" diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/readme.txt b/tools/update-packaging/test/from-mac/Contents/Resources/readme.txt deleted file mode 100644 index b1a96f1fe..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -This from file should be ignored - diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/removed-files b/tools/update-packaging/test/from-mac/Contents/Resources/removed-files deleted file mode 100644 index 5bbdac6f6..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/removed-files +++ /dev/null @@ -1,8 +0,0 @@ -Contents/Resources/removed1.txt -Contents/MacOS/removed2.bin -Contents/MacOS/recursivedir/meh/* -Contents/Resources/dir/ -Contents/MacOS/this file has spaces - - -Contents/MacOS/extra-spaces diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/removed.txt b/tools/update-packaging/test/from-mac/Contents/Resources/removed.txt deleted file mode 100644 index 2c3f0b340..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/removed.txt +++ /dev/null @@ -1 +0,0 @@ -removed diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/same.txt b/tools/update-packaging/test/from-mac/Contents/Resources/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini b/tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js b/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt b/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from/application.ini b/tools/update-packaging/test/from/application.ini deleted file mode 100644 index 942e91a16..000000000 --- a/tools/update-packaging/test/from/application.ini +++ /dev/null @@ -1,5 +0,0 @@ -[App] -Vendor=Mozilla -Name=MarTest -Version=1 -BuildID=20120101010101 diff --git a/tools/update-packaging/test/from/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from/force.txt b/tools/update-packaging/test/from/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from/precomplete b/tools/update-packaging/test/from/precomplete deleted file mode 100644 index e27f4fc31..000000000 --- a/tools/update-packaging/test/from/precomplete +++ /dev/null @@ -1,23 +0,0 @@ -remove "{foodir/update.manifest" -remove "{foodir/same.txt" -remove "{foodir/same.bin" -remove "{foodir/removed.txt" -remove "{foodir/readme.txt" -remove "{foodir/force.txt" -remove "{foodir/diff-patch-larger-than-file.txt" -remove "update.manifest" -remove "searchplugins/diff/diff-patch-larger-than-file.txt" -remove "same.txt" -remove "same.bin" -remove "removed.txt" -remove "readme.txt" -remove "precomplete" -remove "force.txt" -remove "extensions/diff/diff-patch-larger-than-file.txt" -remove "diff-patch-larger-than-file.txt" -remove "application.ini" -rmdir "{foodir/" -rmdir "searchplugins/diff/" -rmdir "searchplugins/" -rmdir "extensions/diff/" -rmdir "extensions/" diff --git a/tools/update-packaging/test/from/readme.txt b/tools/update-packaging/test/from/readme.txt deleted file mode 100644 index b1a96f1fe..000000000 --- a/tools/update-packaging/test/from/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -This from file should be ignored - diff --git a/tools/update-packaging/test/from/removed-files b/tools/update-packaging/test/from/removed-files deleted file mode 100644 index 73b348d9c..000000000 --- a/tools/update-packaging/test/from/removed-files +++ /dev/null @@ -1,8 +0,0 @@ -removed1.txt -removed2.bin -recursivedir/meh/* -dir/ -this file has spaces - - -extra-spaces diff --git a/tools/update-packaging/test/from/removed.txt b/tools/update-packaging/test/from/removed.txt deleted file mode 100644 index 2c3f0b340..000000000 --- a/tools/update-packaging/test/from/removed.txt +++ /dev/null @@ -1 +0,0 @@ -removed diff --git a/tools/update-packaging/test/from/same.bin b/tools/update-packaging/test/from/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/from/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/from/same.txt b/tools/update-packaging/test/from/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from/searchplugins/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from/searchplugins/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from/searchplugins/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from/update-settings.ini b/tools/update-packaging/test/from/update-settings.ini deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/from/update-settings.ini +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/from/update.manifest b/tools/update-packaging/test/from/update.manifest deleted file mode 100644 index d3e8ed851..000000000 --- a/tools/update-packaging/test/from/update.manifest +++ /dev/null @@ -1 +0,0 @@ -from file shouldn't go in update diff --git a/tools/update-packaging/test/from/{foodir/channel-prefs.js b/tools/update-packaging/test/from/{foodir/channel-prefs.js deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/from/{foodir/channel-prefs.js +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/from/{foodir/diff-patch-larger-than-file.txt b/tools/update-packaging/test/from/{foodir/diff-patch-larger-than-file.txt deleted file mode 100644 index 8098d2585..000000000 --- a/tools/update-packaging/test/from/{foodir/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -from file diff --git a/tools/update-packaging/test/from/{foodir/force.txt b/tools/update-packaging/test/from/{foodir/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from/{foodir/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from/{foodir/readme.txt b/tools/update-packaging/test/from/{foodir/readme.txt deleted file mode 100644 index d7c40c63c..000000000 --- a/tools/update-packaging/test/from/{foodir/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This from file should be ignored diff --git a/tools/update-packaging/test/from/{foodir/removed.txt b/tools/update-packaging/test/from/{foodir/removed.txt deleted file mode 100644 index 2c3f0b340..000000000 --- a/tools/update-packaging/test/from/{foodir/removed.txt +++ /dev/null @@ -1 +0,0 @@ -removed diff --git a/tools/update-packaging/test/from/{foodir/same.bin b/tools/update-packaging/test/from/{foodir/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/from/{foodir/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/from/{foodir/same.txt b/tools/update-packaging/test/from/{foodir/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/from/{foodir/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/from/{foodir/update.manifest b/tools/update-packaging/test/from/{foodir/update.manifest deleted file mode 100644 index d3e8ed851..000000000 --- a/tools/update-packaging/test/from/{foodir/update.manifest +++ /dev/null @@ -1 +0,0 @@ -from file shouldn't go in update diff --git a/tools/update-packaging/test/make_full_update.sh b/tools/update-packaging/test/make_full_update.sh deleted file mode 100755 index f2907da9e..000000000 --- a/tools/update-packaging/test/make_full_update.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# 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/. - -# -# This tool generates full update packages for the update system. -# Author: Darin Fisher -# -# In here to use the local common.sh to allow the full mars to have unfiltered files - -. $(dirname "$0")/common.sh - -# ----------------------------------------------------------------------------- - -print_usage() { - notice "Usage: $(basename $0) [OPTIONS] ARCHIVE DIRECTORY" -} - -if [ $# = 0 ]; then - print_usage - exit 1 -fi - -if [ $1 = -h ]; then - print_usage - notice "" - notice "The contents of DIRECTORY will be stored in ARCHIVE." - notice "" - notice "Options:" - notice " -h show this help text" - notice "" - exit 1 -fi - -# ----------------------------------------------------------------------------- - -archive="$1" -targetdir="$2" -# Prevent the workdir from being inside the targetdir so it isn't included in -# the update mar. -if [ $(echo "$targetdir" | grep -c '\/$') = 1 ]; then - # Remove the / - targetdir=$(echo "$targetdir" | sed -e 's:\/$::') -fi -workdir="$targetdir.work" -updatemanifestv2="$workdir/updatev2.manifest" -updatemanifestv3="$workdir/updatev3.manifest" -targetfiles="updatev2.manifest updatev3.manifest" - -mkdir -p "$workdir" - -# Generate a list of all files in the target directory. -pushd "$targetdir" -if test $? -ne 0 ; then - exit 1 -fi - -if [ ! -f "precomplete" ]; then - if [ ! -f "Contents/Resources/precomplete" ]; then - notice "precomplete file is missing!" - exit 1 - fi -fi - -list_files files - -popd - -# Add the type of update to the beginning of the update manifests. -> $updatemanifestv2 -> $updatemanifestv3 -notice "" -notice "Adding type instruction to update manifests" -notice " type complete" -echo "type \"complete\"" >> $updatemanifestv2 -echo "type \"complete\"" >> $updatemanifestv3 - -notice "" -notice "Adding file add instructions to update manifests" -num_files=${#files[*]} - -for ((i=0; $i<$num_files; i=$i+1)); do - f="${files[$i]}" - - if check_for_add_if_not_update "$f"; then - make_add_if_not_instruction "$f" "$updatemanifestv3" - if check_for_add_to_manifestv2 "$f"; then - make_add_instruction "$f" "$updatemanifestv2" "" 1 - fi - else - make_add_instruction "$f" "$updatemanifestv2" "$updatemanifestv3" - fi - - dir=$(dirname "$f") - mkdir -p "$workdir/$dir" - $BZIP2 -cz9 "$targetdir/$f" > "$workdir/$f" - copy_perm "$targetdir/$f" "$workdir/$f" - - targetfiles="$targetfiles \"$f\"" -done - -# Append remove instructions for any dead files. -notice "" -notice "Adding file and directory remove instructions from file 'removed-files'" -append_remove_instructions "$targetdir" "$updatemanifestv2" "$updatemanifestv3" - -$BZIP2 -z9 "$updatemanifestv2" && mv -f "$updatemanifestv2.bz2" "$updatemanifestv2" -$BZIP2 -z9 "$updatemanifestv3" && mv -f "$updatemanifestv3.bz2" "$updatemanifestv3" - -eval "$MAR -C \"$workdir\" -c output.mar $targetfiles" -mv -f "$workdir/output.mar" "$archive" - -# cleanup -rm -fr "$workdir" - -notice "" -notice "Finished" -notice "" diff --git a/tools/update-packaging/test/runtests.sh b/tools/update-packaging/test/runtests.sh deleted file mode 100755 index c66e54eaa..000000000 --- a/tools/update-packaging/test/runtests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -echo "testing make_incremental_updates.py" -python ../make_incremental_updates.py -f testpatchfile.txt - -echo "" -echo "diffing ref.mar and test.mar" -./diffmar.sh ref.mar test.mar test - -echo "" -echo "diffing ref-mac.mar and test-mac.mar" -./diffmar.sh ref-mac.mar test-mac.mar test-mac diff --git a/tools/update-packaging/test/testpatchfile.txt b/tools/update-packaging/test/testpatchfile.txt deleted file mode 100644 index a19c831eb..000000000 --- a/tools/update-packaging/test/testpatchfile.txt +++ /dev/null @@ -1,2 +0,0 @@ -product-1.0.lang.platform.complete.mar,product-2.0.lang.platform.complete.mar,test.mar,"" -product-1.0.lang.mac.complete.mar,product-2.0.lang.mac.complete.mar,test-mac.mar,"" diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/addFeedPrefs.js b/tools/update-packaging/test/to-mac/Contents/MacOS/addFeedPrefs.js deleted file mode 100644 index 3b2aed8e0..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/addFeedPrefs.js +++ /dev/null @@ -1 +0,0 @@ -this is a new file diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/added.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/added.txt deleted file mode 100644 index b242c3606..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/added.txt +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin b/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin +++ /dev/null diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt deleted file mode 100644 index a61ffbb5e..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -file to diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/force.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/same.bin b/tools/update-packaging/test/to-mac/Contents/MacOS/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/update.manifest b/tools/update-packaging/test/to-mac/Contents/MacOS/update.manifest deleted file mode 100644 index 73364fdca..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/update.manifest +++ /dev/null @@ -1 +0,0 @@ -to file shouldn't go in update diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/added.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/added.txt deleted file mode 100644 index b242c3606..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/added.txt +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt deleted file mode 100644 index a61ffbb5e..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -file to diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/readme.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/readme.txt deleted file mode 100644 index b5f7004cc..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This to file should be ignored diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.bin b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.txt b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/update.manifest b/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/update.manifest deleted file mode 100644 index 73364fdca..000000000 --- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/update.manifest +++ /dev/null @@ -1 +0,0 @@ -to file shouldn't go in update diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/application.ini b/tools/update-packaging/test/to-mac/Contents/Resources/application.ini deleted file mode 100644 index 7bdc78819..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/application.ini +++ /dev/null @@ -1,5 +0,0 @@ -[App] -Vendor=Mozilla -Name=MarTest -Version=2 -BuildID=20130101010101 diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/precomplete b/tools/update-packaging/test/to-mac/Contents/Resources/precomplete deleted file mode 100644 index 7af8bfd76..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/precomplete +++ /dev/null @@ -1,33 +0,0 @@ -remove "Contents/MacOS/{foodir/update.manifest" -remove "Contents/MacOS/{foodir/same.txt" -remove "Contents/MacOS/{foodir/same.bin" -remove "Contents/MacOS/{foodir/readme.txt" -remove "Contents/MacOS/{foodir/force.txt" -remove "Contents/MacOS/{foodir/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/{foodir/added.txt" -remove "Contents/MacOS/update.manifest" -remove "Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/searchplugins/added/file.txt" -remove "Contents/MacOS/same.txt" -remove "Contents/MacOS/same.bin" -remove "Contents/MacOS/removed-files" -remove "Contents/MacOS/readme.txt" -remove "Contents/MacOS/force.txt" -remove "Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/extensions/added/file.txt" -remove "Contents/MacOS/diff-patch-larger-than-file.txt" -remove "Contents/MacOS/diff-patch-larger-than-file.bin" -remove "Contents/MacOS/application.ini" -remove "Contents/MacOS/added.txt" -remove "Contents/MacOS/addFeedPrefs.js" -remove "Contents/Resources/precomplete" -rmdir "Contents/MacOS/{foodir/" -rmdir "Contents/MacOS/searchplugins/diff/" -rmdir "Contents/MacOS/searchplugins/added/" -rmdir "Contents/MacOS/searchplugins/" -rmdir "Contents/MacOS/extensions/diff/" -rmdir "Contents/MacOS/extensions/added/" -rmdir "Contents/MacOS/extensions/" -rmdir "Contents/MacOS/" -rmdir "Contents/Resources/" -rmdir "Contents/" diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/readme.txt b/tools/update-packaging/test/to-mac/Contents/Resources/readme.txt deleted file mode 100644 index b5f7004cc..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This to file should be ignored diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/removed-files b/tools/update-packaging/test/to-mac/Contents/Resources/removed-files deleted file mode 100644 index a756cc560..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/removed-files +++ /dev/null @@ -1,14 +0,0 @@ -Contents/Resources/removed1.txt -Contents/MacOS/removed2.bin -Contents/MacOS/recursivedir/meh/* -Contents/MacOS/removed3-foo.txt -Contents/Resources/dir/ -Contents/MacOS/this file has spaces -Contents/MacOS/notherdir/ - - -Contents/Resources/extra-spaces - -Contents/MacOS/lastFile - - diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/same.txt b/tools/update-packaging/test/to-mac/Contents/Resources/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini b/tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js b/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js deleted file mode 100644 index d6ada4591..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js +++ /dev/null @@ -1 +0,0 @@ -add-if-not from partial file diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt b/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to/addFeedPrefs.js b/tools/update-packaging/test/to/addFeedPrefs.js deleted file mode 100644 index 3b2aed8e0..000000000 --- a/tools/update-packaging/test/to/addFeedPrefs.js +++ /dev/null @@ -1 +0,0 @@ -this is a new file diff --git a/tools/update-packaging/test/to/added.txt b/tools/update-packaging/test/to/added.txt deleted file mode 100644 index b242c3606..000000000 --- a/tools/update-packaging/test/to/added.txt +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tools/update-packaging/test/to/application.ini b/tools/update-packaging/test/to/application.ini deleted file mode 100644 index 7bdc78819..000000000 --- a/tools/update-packaging/test/to/application.ini +++ /dev/null @@ -1,5 +0,0 @@ -[App] -Vendor=Mozilla -Name=MarTest -Version=2 -BuildID=20130101010101 diff --git a/tools/update-packaging/test/to/diff-patch-larger-than-file.bin b/tools/update-packaging/test/to/diff-patch-larger-than-file.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to/diff-patch-larger-than-file.bin +++ /dev/null diff --git a/tools/update-packaging/test/to/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to/diff-patch-larger-than-file.txt deleted file mode 100644 index a61ffbb5e..000000000 --- a/tools/update-packaging/test/to/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -file to diff --git a/tools/update-packaging/test/to/distribution/extensions/added/file.txt b/tools/update-packaging/test/to/distribution/extensions/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to/distribution/extensions/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to/extensions/added/file.txt b/tools/update-packaging/test/to/extensions/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to/extensions/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to/extensions/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to/extensions/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to/extensions/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to/force.txt b/tools/update-packaging/test/to/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to/precomplete b/tools/update-packaging/test/to/precomplete deleted file mode 100644 index c2700dd97..000000000 --- a/tools/update-packaging/test/to/precomplete +++ /dev/null @@ -1,30 +0,0 @@ -remove "{foodir/update.manifest" -remove "{foodir/same.txt" -remove "{foodir/same.bin" -remove "{foodir/readme.txt" -remove "{foodir/force.txt" -remove "{foodir/diff-patch-larger-than-file.txt" -remove "{foodir/added.txt" -remove "update.manifest" -remove "searchplugins/diff/diff-patch-larger-than-file.txt" -remove "searchplugins/added/file.txt" -remove "same.txt" -remove "same.bin" -remove "removed-files" -remove "readme.txt" -remove "precomplete" -remove "force.txt" -remove "extensions/diff/diff-patch-larger-than-file.txt" -remove "extensions/added/file.txt" -remove "diff-patch-larger-than-file.txt" -remove "diff-patch-larger-than-file.bin" -remove "application.ini" -remove "added.txt" -remove "addFeedPrefs.js" -rmdir "{foodir/" -rmdir "searchplugins/diff/" -rmdir "searchplugins/added/" -rmdir "searchplugins/" -rmdir "extensions/diff/" -rmdir "extensions/added/" -rmdir "extensions/" diff --git a/tools/update-packaging/test/to/readme.txt b/tools/update-packaging/test/to/readme.txt deleted file mode 100644 index b5f7004cc..000000000 --- a/tools/update-packaging/test/to/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This to file should be ignored diff --git a/tools/update-packaging/test/to/removed-files b/tools/update-packaging/test/to/removed-files deleted file mode 100644 index 4fdfff7fd..000000000 --- a/tools/update-packaging/test/to/removed-files +++ /dev/null @@ -1,14 +0,0 @@ -removed1.txt -removed2.bin -recursivedir/meh/* -removed3-foo.txt -dir/ -this file has spaces -notherdir/ - - -extra-spaces - -lastFile - - diff --git a/tools/update-packaging/test/to/same.bin b/tools/update-packaging/test/to/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/to/same.txt b/tools/update-packaging/test/to/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to/searchplugins/added/file.txt b/tools/update-packaging/test/to/searchplugins/added/file.txt deleted file mode 100644 index 4bbc6747e..000000000 --- a/tools/update-packaging/test/to/searchplugins/added/file.txt +++ /dev/null @@ -1 +0,0 @@ -extfile diff --git a/tools/update-packaging/test/to/searchplugins/diff/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to/searchplugins/diff/diff-patch-larger-than-file.txt deleted file mode 100644 index b779d9648..000000000 --- a/tools/update-packaging/test/to/searchplugins/diff/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -to file diff --git a/tools/update-packaging/test/to/update-settings.ini b/tools/update-packaging/test/to/update-settings.ini deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/to/update-settings.ini +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/to/update.manifest b/tools/update-packaging/test/to/update.manifest deleted file mode 100644 index 73364fdca..000000000 --- a/tools/update-packaging/test/to/update.manifest +++ /dev/null @@ -1 +0,0 @@ -to file shouldn't go in update diff --git a/tools/update-packaging/test/to/{foodir/added.txt b/tools/update-packaging/test/to/{foodir/added.txt deleted file mode 100644 index b242c3606..000000000 --- a/tools/update-packaging/test/to/{foodir/added.txt +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tools/update-packaging/test/to/{foodir/channel-prefs.js b/tools/update-packaging/test/to/{foodir/channel-prefs.js deleted file mode 100644 index 5fa6a9909..000000000 --- a/tools/update-packaging/test/to/{foodir/channel-prefs.js +++ /dev/null @@ -1 +0,0 @@ -add-if-not from complete file diff --git a/tools/update-packaging/test/to/{foodir/diff-patch-larger-than-file.txt b/tools/update-packaging/test/to/{foodir/diff-patch-larger-than-file.txt deleted file mode 100644 index a61ffbb5e..000000000 --- a/tools/update-packaging/test/to/{foodir/diff-patch-larger-than-file.txt +++ /dev/null @@ -1 +0,0 @@ -file to diff --git a/tools/update-packaging/test/to/{foodir/force.txt b/tools/update-packaging/test/to/{foodir/force.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to/{foodir/force.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to/{foodir/readme.txt b/tools/update-packaging/test/to/{foodir/readme.txt deleted file mode 100644 index b5f7004cc..000000000 --- a/tools/update-packaging/test/to/{foodir/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This to file should be ignored diff --git a/tools/update-packaging/test/to/{foodir/same.bin b/tools/update-packaging/test/to/{foodir/same.bin Binary files differdeleted file mode 100644 index a9ee7258c..000000000 --- a/tools/update-packaging/test/to/{foodir/same.bin +++ /dev/null diff --git a/tools/update-packaging/test/to/{foodir/same.txt b/tools/update-packaging/test/to/{foodir/same.txt deleted file mode 100644 index 0ed0d5012..000000000 --- a/tools/update-packaging/test/to/{foodir/same.txt +++ /dev/null @@ -1 +0,0 @@ -file is same diff --git a/tools/update-packaging/test/to/{foodir/update.manifest b/tools/update-packaging/test/to/{foodir/update.manifest deleted file mode 100644 index 73364fdca..000000000 --- a/tools/update-packaging/test/to/{foodir/update.manifest +++ /dev/null @@ -1 +0,0 @@ -to file shouldn't go in update |