Merge branch '2.4'

This commit is contained in:
Petri Lehtinen 2013-02-05 12:51:06 +02:00
commit e00cd4f941

View File

@ -15,7 +15,7 @@ grep 'json_' $top_srcdir/src/jansson.def \
nm -D $SOFILE >/dev/null >$test_log/symbols 2>/dev/null \ nm -D $SOFILE >/dev/null >$test_log/symbols 2>/dev/null \
|| exit 77 # Skip if "nm -D" doesn't seem to work || exit 77 # Skip if "nm -D" doesn't seem to work
grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | sort >$test_log/output grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | grep -v '^_' | sort >$test_log/output
if ! cmp -s $test_log/exports $test_log/output; then if ! cmp -s $test_log/exports $test_log/output; then
diff -u $test_log/exports $test_log/output >&2 diff -u $test_log/exports $test_log/output >&2