projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge work in current build tree.
[m6w6/libmemcached]
/
bootstrap.sh
diff --git
a/bootstrap.sh
b/bootstrap.sh
index 4e2a078e50b65c6d7162caf131f08d90640c9b63..9a549f06cc9994fc41944291ed956778dbc38bbc 100755
(executable)
--- a/
bootstrap.sh
+++ b/
bootstrap.sh
@@
-579,6
+579,7
@@
function make_valgrind ()
TESTS_ENVIRONMENT="$VALGRIND_COMMAND"
fi
TESTS_ENVIRONMENT="$VALGRIND_COMMAND"
fi
+ make_target 'all'
make_target 'check'
ret=$?
make_target 'check'
ret=$?
@@
-653,7
+654,7
@@
function make_for_snapshot ()
assert_no_directory 'autom4te.cache'
run_configure
assert_no_directory 'autom4te.cache'
run_configure
- make_target '
dist
'
+ make_target '
all
'
make_target 'distclean'
# We should have a configure, but no Makefile at the end of this exercise
make_target 'distclean'
# We should have a configure, but no Makefile at the end of this exercise
@@
-856,6
+857,13
@@
function make_universe ()
make_install_system
}
make_install_system
}
+function check_snapshot ()
+{
+ if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
+ assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
+ fi
+}
+
function make_for_continuus_integration ()
{
# Setup the environment if we are local
function make_for_continuus_integration ()
{
# Setup the environment if we are local
@@
-871,9
+879,7
@@
function make_for_continuus_integration ()
assert_file 'configure'
fi
assert_file 'configure'
fi
- if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
- assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
- fi
+ check_snapshot
else
# If we didn't require a snapshot, then we should not have a configure
assert_no_file 'configure'
else
# If we didn't require a snapshot, then we should not have a configure
assert_no_file 'configure'
@@
-890,41
+896,15
@@
function make_for_continuus_integration ()
assert_exec_file 'configure'
assert_file 'Makefile'
assert_exec_file 'configure'
assert_file 'Makefile'
+ make_target 'all'
+
# make rpm includes "make distcheck"
if [[ -f rpm.am ]]; then
# make rpm includes "make distcheck"
if [[ -f rpm.am ]]; then
- make_target 'all'
make_rpm
elif [[ -d rpm ]]; then
make_rpm
elif [[ -d rpm ]]; then
- make_target 'all'
make_rpm
make_rpm
- else
- make_distcheck
fi
;;
fi
;;
- *-precise-*)
- run_configure
-
- assert_exec_file 'configure'
- assert_file 'Makefile'
-
- make_distcheck
- ;;
- *-quantal-*)
- run_configure
-
- assert_exec_file 'configure'
- assert_file 'Makefile'
-
- make_distcheck
- ;;
- *-raring-*)
- run_configure
-
- assert_exec_file 'configure'
- assert_file 'Makefile'
-
- make_distcheck
- ;;
*)
make_jenkins_default
;;
*)
make_jenkins_default
;;
@@
-1636,6
+1616,7
@@
function bootstrap ()
'snapshot')
make_for_snapshot
snapshot_run=true
'snapshot')
make_for_snapshot
snapshot_run=true
+ check_snapshot
;;
'rpm')
make_rpm
;;
'rpm')
make_rpm