Skip to content

Disable failing libevent test and re-enable the rest #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmarier merged 1 commit into from
Oct 3, 2025
Merged

Disable failing libevent test and re-enable the rest #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build_darwin_arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ cd ../../
tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C $BUILD_CPU
cd "$BUILD_CPU/libevent-$LIBEVENT_VERSION"
patch -p0 < ../../patch/libevent/regress.c.patch
patch -p0 < ../../patch/libevent/regress_http.c.patch
./configure \
LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=$BUILD_CPU-apple-macos11" \
CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=$BUILD_CPU-apple-macos11" \
Expand All @@ -78,7 +79,7 @@ patch -p0 < ../../patch/libevent/regress.c.patch
--host=$BUILD_HOST \
--disable-clock-gettime \
--with-pic
make ${jobs:+-j${jobs}} && make install
make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
cd ../../

tar -xvzf "tor-$TOR_VERSION.tar.gz" -C $BUILD_CPU
Expand Down
3 changes: 2 additions & 1 deletion build_darwin_x86_64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ cd ../../
tar -zxvf "libevent-$LIBEVENT_VERSION.tar.gz" -C $BUILD_CPU
cd "$BUILD_CPU/libevent-$LIBEVENT_VERSION"
patch -p0 < ../../patch/libevent/regress.c.patch
patch -p0 < ../../patch/libevent/regress_http.c.patch
./configure \
LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=$BUILD_CPU-apple-macos11" \
CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=$BUILD_CPU-apple-macos11" \
Expand All @@ -78,7 +79,7 @@ patch -p0 < ../../patch/libevent/regress.c.patch
--host=$BUILD_HOST \
--disable-clock-gettime \
--with-pic
make ${jobs:+-j${jobs}} && make install
make ${jobs:+-j${jobs}} && make ${jobs:+-j${jobs}} check && make install
cd ../../

tar -xvzf "tor-$TOR_VERSION.tar.gz" -C $BUILD_CPU
Expand Down
14 changes: 14 additions & 0 deletions patch/libevent/regress_http.c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Description: Disable test failing on macOS
Last-Update: 2025-10-03
Bug-Brave: https://github.com/brave/tor_build_scripts/issues/156

--- test/regress_http.c.orig 2025-10-03 14:43:40.534171434 -0700
+++ test/regress_http.c 2025-10-03 14:43:57.036915079 -0700
@@ -4759,7 +4759,6 @@
{ "connection_retry_conn_address", http_connection_retry_conn_address_test,
TT_ISOLATED|TT_OFF_BY_DEFAULT, &basic_setup, NULL },

- HTTP(data_length_constraints),
HTTP(read_on_write_error),
HTTP(non_lingering_close),
HTTP(lingering_close),