Revision ad65aa88

b/Makefile
77 77

  
78 78
-include config-all-devices.mak
79 79

  
80
build-all: $(DOCS) $(TOOLS) $(CHECKS) recurse-all
80
build-all: $(DOCS) $(TOOLS) recurse-all
81 81

  
82 82
config-host.h: config-host.h-timestamp
83 83
config-host.h-timestamp: config-host.mak
......
203 203
# avoid old build problems by removing potentially incorrect old files
204 204
	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
205 205
	rm -f qemu-options.def
206
	rm -f *.o *.d *.a *.lo $(TOOLS) $(CHECKS) qemu-ga TAGS cscope.* *.pod *~ */*~
206
	rm -f *.o *.d *.a *.lo $(TOOLS) qemu-ga TAGS cscope.* *.pod *~ */*~
207 207
	rm -Rf .libs
208 208
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
209 209
	rm -f qemu-img-cmds.h
b/configure
176 176
aix="no"
177 177
blobs="yes"
178 178
pkgversion=""
179
check_utests=""
180 179
pie=""
181 180
zero_malloc=""
182 181
trace_backend="nop"
......
733 732
  ;;
734 733
  --enable-fdt) fdt="yes"
735 734
  ;;
736
  --disable-check-utests) check_utests="no"
737
  ;;
738
  --enable-check-utests) check_utests="yes"
739
  ;;
740 735
  --disable-nptl) nptl="no"
741 736
  ;;
742 737
  --enable-nptl) nptl="yes"
......
1014 1009
echo "  --enable-curl            enable curl connectivity"
1015 1010
echo "  --disable-fdt            disable fdt device tree"
1016 1011
echo "  --enable-fdt             enable fdt device tree"
1017
echo "  --disable-check-utests   disable check unit-tests"
1018
echo "  --enable-check-utests    enable check unit-tests"
1019 1012
echo "  --disable-bluez          disable bluez stack connectivity"
1020 1013
echo "  --enable-bluez           enable bluez stack connectivity"
1021 1014
echo "  --disable-slirp          disable SLIRP userspace network connectivity"
......
1923 1916
fi # test "$curl"
1924 1917

  
1925 1918
##########################################
1926
# check framework probe
1927

  
1928
if test "$check_utests" != "no" ; then
1929
  cat > $TMPC << EOF
1930
#include <check.h>
1931
int main(void) { suite_create("qemu test"); return 0; }
1932
EOF
1933
  check_libs=`$pkg_config --libs check 2>/dev/null`
1934
  if compile_prog "" $check_libs ; then
1935
    check_utests=yes
1936
    libs_tools="$check_libs $libs_tools"
1937
  else
1938
    if test "$check_utests" = "yes" ; then
1939
      feature_not_found "check"
1940
    fi
1941
    check_utests=no
1942
  fi
1943
fi # test "$check_utests"
1944

  
1945
##########################################
1946 1919
# bluez support probe
1947 1920
if test "$bluez" != "no" ; then
1948 1921
  cat > $TMPC << EOF
......
2799 2772
    if [ "$guest_agent" = "yes" ]; then
2800 2773
      tools="qemu-ga\$(EXESUF) $tools"
2801 2774
    fi
2802
    if [ "$check_utests" = "yes" ]; then
2803
      checks="$checks"
2804
    fi
2805
    test_progs="$checks check-qdict check-qfloat check-qint check-qstring check-qlist check-qjson test-coroutine test-qmp-output-visitor test-qmp-input-visitor"
2806 2775
  fi
2807 2776
fi
2808 2777

  
......
2856 2825
echo "SDL support       $sdl"
2857 2826
echo "curses support    $curses"
2858 2827
echo "curl support      $curl"
2859
echo "check support     $check_utests"
2860 2828
echo "mingw32 support   $mingw32"
2861 2829
echo "Audio drivers     $audio_drv_list"
2862 2830
echo "Extra audio cards $audio_card_list"
......
3274 3242
fi
3275 3243

  
3276 3244
echo "TOOLS=$tools" >> $config_host_mak
3277
echo "CHECKS=$test_progs" >> $config_host_mak
3278 3245
echo "ROMS=$roms" >> $config_host_mak
3279 3246
echo "MAKE=$make" >> $config_host_mak
3280 3247
echo "INSTALL=$install" >> $config_host_mak
b/tests/Makefile
1
CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist
2
CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor
3
CHECKS += test-coroutine
4

  
1 5
check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)
2 6

  
3 7
check-qint: check-qint.o qint.o $(tools-obj-y)
......
31 35
test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
32 36

  
33 37
.PHONY: check
34
check: $(patsubst %,run-check-%,$(CHECKS))
35

  
36
run-check-%: %
37
	./$<
38

  
38
check: $(CHECKS)
39
	gtester $(CHECKS)

Also available in: Unified diff