Browse Source

Alejandro Mery <amery@geeks.cl>:

this is a not-tested proposal for make check when asked and supported. (no-cross only)
plus some non-tested name changes ans additions by Rene Rebe


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1486 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Alejandro Mery 21 years ago
parent
commit
d0ae6e21f6
5 changed files with 25 additions and 4 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +5
    -4
      scripts/config.hlp
  3. +4
    -0
      scripts/config.in
  4. +13
    -0
      scripts/functions
  5. +2
    -0
      scripts/parse-config

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -6,6 +6,7 @@
- Stefan Paletta: updated python (2.3) and other stefanp repository updates - Stefan Paletta: updated python (2.3) and other stefanp repository updates
openhbci/gnucash updates and fixes openhbci/gnucash updates and fixes
- Jan Veninga: sparc kernel-disable.list - Jan Veninga: sparc kernel-disable.list
- Alejandro Mery / Rene Rebe: added make check/test regression test option
*) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2) *) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2)

+ 5
- 4
scripts/config.hlp

@ -20,10 +20,6 @@
# #
# --- ROCK-COPYRIGHT-NOTE-END --- # --- ROCK-COPYRIGHT-NOTE-END ---
# Here are the help text's for ROCKLinux build configuration.
# TODO: write more about help comments ... what to write and how much
# (please much ;-) ).
COMMENT_ARCHCPUOPT COMMENT_ARCHCPUOPT
In this section you are able to select the architecture, the CPU and In this section you are able to select the architecture, the CPU and
whether you are cross-building/porting to another architecture. whether you are cross-building/porting to another architecture.
@ -239,6 +235,11 @@ ROCKCFG_DO_REBUILD_STAGE
In former times this was recommended - but nowadays this is only a In former times this was recommended - but nowadays this is only a
paranoia thing. paranoia thing.
ROCKCFG_DO_CHECK
This options enables to run a make check / test target for packages
with support for this. This can be used as extended quality assurance
to make sure the resulting binaries work correct.
ROCKCFG_OPT ROCKCFG_OPT
If this option is enabled binaries and libraries are optimised and If this option is enabled binaries and libraries are optimised and
debugging information are not build into those binaries and debugging information are not build into those binaries and

+ 4
- 0
scripts/config.in

@ -338,6 +338,10 @@ break packages!'
bool 'Build and use a (pseudo-)cross compiler' ROCKCFG_USE_CROSSCC 1 bool 'Build and use a (pseudo-)cross compiler' ROCKCFG_USE_CROSSCC 1
bool 'Make rebuild stage (stage 9)' ROCKCFG_DO_REBUILD_STAGE 1 bool 'Make rebuild stage (stage 9)' ROCKCFG_DO_REBUILD_STAGE 1
if [ $ROCKCFG_CROSSBUILD != 1 ]; then
bool 'Run a check/test for packages with support' ROCKCFG_DO_CHECK 0
fi
if [ $ROCKCFG_USE_CROSSCC != 1 ]; then if [ $ROCKCFG_USE_CROSSCC != 1 ]; then
pkgfilter sed 's,^\([XO] \)0,\1-,' pkgfilter sed 's,^\([XO] \)0,\1-,'
fi fi

+ 13
- 0
scripts/functions

@ -256,6 +256,19 @@ function eval_config_command() {
eval "$config_command" eval "$config_command"
} }
# run 'make check' if Makefile supports it.
#
function run_check() {
if grep -q -e "^check:" ./Makefile; then
echo "Running make check ..."
$MAKE check
fi
if grep -q -e "^test:" ./Makefile; then
echo "Running make test ..."
$MAKE test
fi
}
# Parse the *.desc file. Use the description from PKG-DESC-FORMAT and # Parse the *.desc file. Use the description from PKG-DESC-FORMAT and
# save the tag data in $desc_*. # save the tag data in $desc_*.
# #

+ 2
- 0
scripts/parse-config

@ -60,6 +60,8 @@ if [ -f "architecture/$arch/archtest.out" ]
if [ -f "architecture/$arch/archtest.sh" ] if [ -f "architecture/$arch/archtest.sh" ]
then . "architecture/$arch/archtest.sh" ; fi then . "architecture/$arch/archtest.sh" ; fi
[ "$ROCKCFG_DO_CHECK" = 1 ] && hook_add inmake 6 'run_check'
base=$(pwd -P) base=$(pwd -P)
if [ -f "/R_chroot.sh" ] if [ -f "/R_chroot.sh" ]

Loading…
Cancel
Save