merge_branches() { local from="$1" to="$2" if [ "x$to" = "x$branch" ]; then Git_merge --safe "$from" "$to" git checkout "$to" fi } post_process() { branch="$1" merge_branches macros2 macros3 merge_branches virgl-spice virgl-spice-save merge_branches mix3 mix4 merge_branches nvidia nvidia2 merge_branches manual_keepalive manual_keepalive_mr merge_branches cpp_parse_refs surface_ref case "$branch" in cpp_bundle|reds_minor|surface_ref) ./rebuild_mrs || true ;; esac } build_it0() { if ! make -j4; then make clean &> /dev/null rm -rf server/.deps server/tests/.deps tools/.deps touch server/tests/Makefile.am || true #autoreconf -vif &> /dev/null #./script make -j4 fi cd server make check } build_it() { ./meson_build cd meson meson test --suite spice: && return 0 sleep 0.5 meson test --suite spice: || { cat meson-logs/testlog.txt; exit 1; } } # NOTES #Git_merge --safe refactory jj #Git_merge --safe glz2 encoders_separation