| 1 |
vapier 12/01/04 08:25:06 |
| 2 |
|
| 3 |
Modified: savedconfig.sh tests-common.sh |
| 4 |
Log: |
| 5 |
add tests for savedconfig.eclass:restore_config too |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 eclass/tests/savedconfig.sh |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/savedconfig.sh?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/savedconfig.sh?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/savedconfig.sh?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: savedconfig.sh |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/tests/savedconfig.sh,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- savedconfig.sh 4 Jan 2012 06:18:51 -0000 1.1 |
| 21 |
+++ savedconfig.sh 4 Jan 2012 08:25:05 -0000 1.2 |
| 22 |
@@ -4,28 +4,73 @@ |
| 23 |
|
| 24 |
inherit savedconfig |
| 25 |
|
| 26 |
-sc() { EBUILD_PHASE=install save_config "$@" ; } |
| 27 |
-rc() { EBUILD_PHASE=prepare restore_config "$@" ; } |
| 28 |
+quiet() { |
| 29 |
+ local out ret |
| 30 |
+ out=$("$@" 2>&1) |
| 31 |
+ ret=$? |
| 32 |
+ [[ ${ret} -eq 0 ]] || echo "${out}" |
| 33 |
+ return ${ret} |
| 34 |
+} |
| 35 |
+sc() { EBUILD_PHASE=install quiet save_config "$@" ; } |
| 36 |
+rc() { EBUILD_PHASE=prepare quiet restore_config "$@" ; } |
| 37 |
|
| 38 |
-tbegin "simple save_config" |
| 39 |
-sc $0 >/dev/null |
| 40 |
-ret=$? |
| 41 |
-[[ -f ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 42 |
-tend $(( ret + $? )) |
| 43 |
-rm -rf "${ED}/etc" |
| 44 |
- |
| 45 |
-tbegin "multi save_config" |
| 46 |
-sc *.sh >/dev/null |
| 47 |
-ret=$? |
| 48 |
-[[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 49 |
-tend $(( ret + $? )) |
| 50 |
-rm -rf "${ED}/etc" |
| 51 |
- |
| 52 |
-tbegin "dir save_config" |
| 53 |
-sc CVS >/dev/null |
| 54 |
-ret=$? |
| 55 |
-[[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 56 |
-tend $(( ret + $? )) |
| 57 |
-rm -rf "${ED}/etc" |
| 58 |
+cleanup() { rm -rf "${ED}"/* "${T}"/* "${WORKDIR}"/* ; } |
| 59 |
+test-it() { |
| 60 |
+ local ret=0 |
| 61 |
+ tbegin "$@" |
| 62 |
+ mkdir -p "${ED}"/etc/portage/savedconfig |
| 63 |
+ : $(( ret |= $? )) |
| 64 |
+ pushd "${WORKDIR}" >/dev/null |
| 65 |
+ : $(( ret |= $? )) |
| 66 |
+ test |
| 67 |
+ : $(( ret |= $? )) |
| 68 |
+ popd >/dev/null |
| 69 |
+ : $(( ret |= $? )) |
| 70 |
+ tend ${ret} |
| 71 |
+ cleanup |
| 72 |
+} |
| 73 |
+ |
| 74 |
+test() { |
| 75 |
+ touch f || return 1 |
| 76 |
+ sc f || return 1 |
| 77 |
+ [[ -f ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 78 |
+} |
| 79 |
+test-it "simple save_config" |
| 80 |
+ |
| 81 |
+test() { |
| 82 |
+ touch a b c || return 1 |
| 83 |
+ sc a b c || return 1 |
| 84 |
+ [[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 85 |
+} |
| 86 |
+test-it "multi save_config" |
| 87 |
+ |
| 88 |
+test() { |
| 89 |
+ mkdir dir || return 1 |
| 90 |
+ touch dir/{a,b,c} || return 1 |
| 91 |
+ sc dir || return 1 |
| 92 |
+ [[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] |
| 93 |
+} |
| 94 |
+test-it "dir save_config" |
| 95 |
+ |
| 96 |
+PORTAGE_CONFIGROOT=${D} |
| 97 |
+ |
| 98 |
+test() { |
| 99 |
+ echo "ggg" > f || return 1 |
| 100 |
+ rc f || return 1 |
| 101 |
+ [[ $(<f) == "ggg" ]] |
| 102 |
+} |
| 103 |
+test-it "simple restore_config" |
| 104 |
+ |
| 105 |
+test() { |
| 106 |
+ echo "ggg" > f || return 1 |
| 107 |
+ rc f || return 1 |
| 108 |
+ [[ $(<f) == "ggg" ]] || return 1 |
| 109 |
+ sc f || return 1 |
| 110 |
+ |
| 111 |
+ echo "hhh" > f || return 1 |
| 112 |
+ rc f || return 1 |
| 113 |
+ [[ $(<f) == "ggg" ]] |
| 114 |
+} |
| 115 |
+test-it "simple restore+save config" |
| 116 |
|
| 117 |
texit |
| 118 |
|
| 119 |
|
| 120 |
|
| 121 |
1.10 eclass/tests/tests-common.sh |
| 122 |
|
| 123 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?rev=1.10&view=markup |
| 124 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?rev=1.10&content-type=text/plain |
| 125 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?r1=1.9&r2=1.10 |
| 126 |
|
| 127 |
Index: tests-common.sh |
| 128 |
=================================================================== |
| 129 |
RCS file: /var/cvsroot/gentoo-x86/eclass/tests/tests-common.sh,v |
| 130 |
retrieving revision 1.9 |
| 131 |
retrieving revision 1.10 |
| 132 |
diff -u -r1.9 -r1.10 |
| 133 |
--- tests-common.sh 4 Jan 2012 06:18:51 -0000 1.9 |
| 134 |
+++ tests-common.sh 4 Jan 2012 08:25:05 -0000 1.10 |
| 135 |
@@ -8,6 +8,7 @@ |
| 136 |
source ../${e}.eclass |
| 137 |
done |
| 138 |
} |
| 139 |
+EXPORT_FUNCTIONS() { :; } |
| 140 |
|
| 141 |
debug-print() { |
| 142 |
[[ ${#} -eq 0 ]] && return |
| 143 |
@@ -37,6 +38,7 @@ |
| 144 |
done |
| 145 |
return 1 |
| 146 |
} |
| 147 |
+use() { has "$1" ${IUSE} ; } |
| 148 |
|
| 149 |
die() { |
| 150 |
echo "die: $*" 1>&2 |
| 151 |
@@ -107,9 +109,12 @@ |
| 152 |
} |
| 153 |
|
| 154 |
tmpdir="${PWD}/tmp" |
| 155 |
-D="${tmpdir}/$0/${RANDOM}" |
| 156 |
+pkg_root="${tmpdir}/$0/${RANDOM}" |
| 157 |
+T="${pkg_root}/temp" |
| 158 |
+D="${pkg_root}/image" |
| 159 |
+WORKDIR="${pkg_root}/work" |
| 160 |
ED=${D} |
| 161 |
-mkdir -p "${D}" |
| 162 |
+mkdir -p "${D}" "${T}" "${WORKDIR}" |
| 163 |
|
| 164 |
dodir() { |
| 165 |
mkdir -p "${@/#/${ED}/}" |
| 166 |
@@ -117,6 +122,7 @@ |
| 167 |
|
| 168 |
elog() { einfo "$@" ; } |
| 169 |
|
| 170 |
+IUSE="" |
| 171 |
CATEGORY="dev-eclass" |
| 172 |
PN="tests" |
| 173 |
PV="0" |
Archives