X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=.cirrus.yml;h=a7fc91a5f46968c635a6ceb22300661cd4488219;hb=7ce22eee1517dfde4c19a1970aa53bc63557e3a3;hp=e12ca8f3785dae35cfc0b37fb6803b03ede5f452;hpb=b3b8f6dc48c193ccc03c931519f67cbdc6e94c20;p=awesomized%2Flibmemcached

diff --git a/.cirrus.yml b/.cirrus.yml
index e12ca8f3..a7fc91a5 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,10 +13,10 @@ task:
     gitter: ENCRYPTED[92e34815ac1a27681bf868c8299bfa37f3cb98c7d88156884c85dfb33e786bd3124c5d624721fb13735d23f7c57ead4b]
     ports: RELEASE_12_1_0
   freebsd_instance:
-    image_family: freebsd-12-1-snap
+    image_family: freebsd-12-1
+    cpu: 4
+    memory: 8G
   discover_script: |
-    pw user mod nobody -s /bin/sh -d $(pwd)/build
-    ulimit -a
     sudo -u nobody ulimit -a
     cat /etc/hosts
     cat /etc/host.conf
@@ -25,7 +25,6 @@ task:
     netstat
     sysctl -a
     dmesg
-    exit 1
   dependencies_script: |
     pkg update
     pkg upgrade -y
@@ -38,14 +37,18 @@ task:
       libevent \
       pkgconf \
       subversion \
-      sudo
+      sudo \
+      tbb
   memcached_script: |
     svn co https://svn.freebsd.org/ports/tags/${ports}/databases/memcached memcached
     svn co https://svn.freebsd.org/ports/tags/${ports}/Mk /usr/ports/Mk
     svn co https://svn.freebsd.org/ports/tags/${ports}/Templates /usr/ports/Templates
     cd memcached
     echo bin/memcached > pkg-plist
-    make all install SASLPWDB_CONFIGURE_ENABLE=sasl-pwdb OPTIONS_SET="SASL SASLPWDB" OPTIONS_DEFINE="SASL SASLPWDB"
+    make all install \
+      SASLPWDB_CONFIGURE_ENABLE=sasl-pwdb \
+      OPTIONS_SET="SASL SASLPWDB" \
+      OPTIONS_DEFINE="SASL SASLPWDB"
     cd ..
   prepare_script: |
     mkdir build
@@ -57,6 +60,8 @@ task:
     sudo -E -u nobody make -C build -j2 all
   test_script: |
     sysctl net.inet.tcp.msl=500
+    sysctl net.inet.tcp.blackhole=0
+    sysctl net.inet.udp.blackhole=0
     sudo -E -u nobody make -C build -j2 test/fast
   install_script: |
     sudo -E -u nobody make -C build install DESTDIR=/tmp