test

.github/workflows/main.yml

@@ -46,15 +46,13 @@ jobs:
         with:
           ruby-version: ${{ env.DEFAULT_RUBY_VERSION }}
           bundler-cache: true
-      - run: bundle exec rake src/cxx_supportlib/Constants.h
-      - run: c++ -o foo.o -Itest/cxx -Itest/support -Isrc/agent -Isrc/cxx_supportlib -Isrc/cxx_supportlib/vendor-copy -Isrc/cxx_supportlib/vendor-modified -include test/cxx/TestSupport.h -Isrc/cxx_supportlib/vendor-modified/libev -DUSE_VENDORED_LIBEV -Isrc/cxx_supportlib/vendor-copy/libuv/include -DTESTING_APPLICATION_POOL -D_REENTRANT -I/usr/local/include -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long -Wno-missing-field-initializers -Wno-unknown-pragmas -feliminate-unused-debug-symbols -feliminate-unused-debug-types -fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED -Wno-attributes -DHAS_ALLOCA_H -DHAVE_ACCEPT4 -DHAS_SFENCE -DHAS_LFENCE -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS -ggdb -std=gnu++11 -Wno-unused-local-typedefs -Wno-format-nonliteral -DHAS_UNORDERED_MAP -c test/cxx/Core/SecurityUpdateCheckerTest.cpp -v
-      # - run: bundle exec rake -j2 test:cxx
-      #   env:
-      #     SUDO: '1'
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: cxx-${{ matrix.os }}
-      #     path: 'buildout/testlogs/*'
+      - run: bundle exec drake -j2 test:cxx
+        env:
+          SUDO: '1'
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cxx-${{ matrix.os }}
+          path: 'buildout/testlogs/*'
 
   # integration:
   #   name: '${{ matrix.integration.name }} integration tests on ${{ matrix.os }}'

Gemfile

@@ -1,26 +1,22 @@
 source 'https://rubygems.org/'
-require 'rubygems/version.rb'
 
-# Make Bundler handle Ruby compat: https://github.com/rubygems/bundler-features/issues/120
-ruby RUBY_VERSION
+ruby '>= 2.6'
 
-group :base do
+group :development do
   gem 'json'
   gem 'mime-types', '~> 3.5.1'
+  gem 'drake'
   gem 'rack'
+  gem 'rackup', '>= 2.1'
   gem 'rake'
   gem 'rspec', '~> 3.12.0'
   gem 'rspec-collection_matchers'
-end
-
-group :future do
   gem 'webrick', '~> 1.8.1'
-  gem 'rackup', '>= 2.1'
 end
 
 if ENV['USER'] == 'camdennarzt'
-group :development do
-  gem 'solargraph'
-  gem 'gpgme'
-end
+  group :development do
+    gem 'solargraph'
+    gem 'gpgme'
+  end
 end

Gemfile.lock

@@ -1,37 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
-    json (2.5.1)
-    mime-types (3.5.1)
+    comp_tree (1.1.3)
+    diff-lcs (1.5.1)
+    drake (0.9.2.0.3.1)
+      comp_tree (>= 1.1.3)
+    json (2.7.2)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
-    rack (3.0.10)
+    mime-types-data (3.2024.0903)
+    rack (3.1.7)
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rake (12.3.3)
+    rake (13.2.1)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
     rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.12.2)
+    rspec-core (3.12.3)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-expectations (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.12.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+    rspec-support (3.12.2)
     webrick (1.8.1)
 
 PLATFORMS
+  arm64-darwin-22
+  arm64-darwin-23
   ruby
+  x86_64-linux
 
 DEPENDENCIES
+  drake
   json
   mime-types (~> 3.5.1)
   rack
@@ -41,3 +48,8 @@ DEPENDENCIES
   rspec-collection_matchers
   webrick (~> 1.8.1)
 
+RUBY VERSION
+   ruby 3.3.0p0
+
+BUNDLED WITH
+   2.5.10

build/test_basics.rb

@@ -66,19 +66,11 @@
     sh "#{gem_install} bundler"
   end
 
-  if install_base_deps
-    unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') || RUBY_PLATFORM =~ /darwin/
-      if bundler_too_new?
-        sh "bundle config set --local without future"
-      else
-        bundle_args.concat(["--without", "future"])
-      end
-    end
-  else
+  if !install_base_deps
     if bundler_too_new?
-      sh "bundle config set --local without 'base future'"
+      sh "bundle config set --local without 'base'"
     else
-      bundle_args.concat(["--without", "base", "future"])
+      bundle_args.concat(["--without", "base"])
     end
   end
   sh "bundle install #{bundle_args.join(' ')} #{ENV['BUNDLE_ARGS']}"