Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

Commit 0f29474

Browse files
authored
Get CI functional (#2096)
* Update the travis setup to the new needs. * Fix/stabilize SerfUrlAsyncFetcherTest.TestHttpsSucceedsForGoogleCom
1 parent 7018ecb commit 0f29474

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,25 @@ before_install:
1111
- sudo add-apt-repository -y ppa:git-core/ppa
1212
- sudo apt-get update -q
1313
- sudo apt-get install -q -y git
14-
- sudo apt-get install pkg-config zip g++ zlib1g-dev unzip python3 ninja-build cmake gperf memcached apache2-dev python2 clang-10
15-
- wget https://github.com/bazelbuild/bazel/releases/download/4.1.0/bazel-4.1.0-installer-linux-x86_64.sh
16-
- chmod +x bazel-4.1.0-installer-linux-x86_64.sh
17-
- ./bazel-4.1.0-installer-linux-x86_64.sh --user
14+
- sudo apt-get install pkg-config zip g++ zlib1g-dev unzip python3 ninja-build cmake gperf memcached apache2-dev python2
15+
- wget https://github.com/bazelbuild/bazel/releases/download/6.0.0-pre.20220720.3/bazel-6.0.0-pre.20220720.3-installer-linux-x86_64.sh
16+
- chmod +x bazel-6.0.0-pre.20220720.3-installer-linux-x86_64.sh
17+
- ./bazel-6.0.0-pre.20220720.3-installer-linux-x86_64.sh --user
18+
- wget https://apt.llvm.org/llvm.sh
19+
- chmod +x llvm.sh
20+
- sudo ./llvm.sh 14
1821
- sudo service memcached start
1922
- sudo service redis-server start
2023
env:
2124
global:
2225
- MAKEFLAGS=-j3
23-
- CXX=clang++-10
24-
- CC=clang-10
26+
- CXX=clang++-14
27+
- CC=clang-14
2528
matrix:
2629
- BIT_FLAG=
2730

2831
script:
29-
- bazel test --test_env=REDIS_PORT=6379 --test_env=MEMCACHED_PORT=11211 -c dbg //test/...
32+
- bazel test --test_env=REDIS_PORT=6379 --test_env=MEMCACHED_PORT=11211 -c dbg --test_output=streamed //test/...
3033

3134
after_failure:
3235
- cat build.log

test/pagespeed/system/serf_url_async_fetcher_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,14 @@ TEST_F(SerfUrlAsyncFetcherTest, TestHttpsFailsForSelfSignedCert) {
675675
ValidateMonitoringStats(0, 1);
676676
}
677677

678-
TEST_F(SerfUrlAsyncFetcherTest, TestHttpsSucceedsForGoogleCom) {
678+
TEST_F(SerfUrlAsyncFetcherTest, TestHttpsSucceedsForMPS) {
679679
serf_url_async_fetcher_->SetHttpsOptions("enable");
680680
EXPECT_TRUE(serf_url_async_fetcher_->SupportsHttps());
681681
// If you're here chances are that this test broke. It is fairly brittle and depends
682682
// on the target page not changing it's response, which it actually does every year or so.
683683
// In any case, don't worry about having to change this; the goal is to test basic fetching
684684
// capabilities over https.
685-
TestHttpsSucceeds("https://about.google/", "<!DOCTYPE html>");
685+
TestHttpsSucceeds("https://www.modpagespeed.com/", "<!--");
686686
ValidateMonitoringStats(1, 0);
687687
}
688688

0 commit comments

Comments
 (0)