Fix CircleCI

Author: mernst

.circleci/config.yml

@@ -385,7 +385,7 @@ jobs:
       - run:
          name: test-guava.sh
          command: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-guava.sh
-         no_output_timeout: "30m"
+         no_output_timeout: "50m"
 
 
   plume_lib_jdk25:

.circleci/defs.m4

@@ -120,7 +120,7 @@ circleci_boilerplate($1,)
       - run:
          name: test-guava.sh
          command: export ORG_GRADLE_PROJECT_jdkTestVersion=$1 && ./checker/bin-devel/test-guava.sh
-         no_output_timeout: "30m"
+         no_output_timeout: "50m"
 ])dnl
 dnl
 define([plume_lib_job], [dnl

build.gradle

@@ -1162,27 +1162,27 @@ subprojects {
     tasks.withType(Test) {
       jvmArgs += compilerArgsForRunningCF
 
-      // maxParallelForks controls the parallelism of a single Test
-      // task. --parallel controls parallelism for the entire build.
-
-      // Run tests in parallel, except on CI where it seems to lead to flaky failures.
-      // The TF_BUILD environment variable is set to 'True' for jobs running on Azure Pipelines.
-      if (!System.getenv('TF_BUILD')?.equals('True')) {
-        // Not running under Azure Pipelines CI.
-
-        maxParallelForks = Runtime.runtime.availableProcessors() ?: 1
-      } else {
-        // Running under Azure Pipelines CI.
-
-        // Per Manu's comment above, on CI, parallelism seems to lead to flaky failures.
-        maxParallelForks = 1
-
-        // Fork the test to try to improve performance.
-        // https://docs.gradle.org/current/userguide/performance.html#fork_tests_into_multiple_processes
-        tasks.withType(Test) {
-          forkEvery = 25
-        }
-      }
+      // // maxParallelForks controls the parallelism of a single Test task.
+      // // --parallel controls parallelism for the entire build.
+
+      // // Run tests in parallel, except on CI where it seems to lead to flaky failures.
+      // // The TF_BUILD environment variable is set to 'True' for jobs running on Azure Pipelines.
+      // if (!System.getenv('TF_BUILD')?.equals('True')) {
+      //   // Not running under Azure Pipelines CI.
+
+      //   maxParallelForks = Runtime.runtime.availableProcessors() ?: 1
+      // } else {
+      //   // Running under Azure Pipelines CI.
+
+      //   // Per Manu's comment above, on CI, parallelism seems to lead to flaky failures.
+      //   maxParallelForks = 1
+
+      //   // Fork the test to try to improve performance.
+      //   // https://docs.gradle.org/current/userguide/performance.html#fork_tests_into_multiple_processes
+      //   tasks.withType(Test) {
+      //     forkEvery = 25
+      //   }
+      // }
 
       if (project.name.is('checker')) {
         dependsOn('assembleForJavac')

checker/bin-devel/clone-related.sh

@@ -19,6 +19,13 @@ export CHECKERFRAMEWORK="${CHECKERFRAMEWORK:-$(pwd -P)}"
 echo "CHECKERFRAMEWORK=$CHECKERFRAMEWORK"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 
+IS_CI="$("$SCRIPT_DIR"/is-ci.sh)"
+export IS_CI
+if [ -n "$IS_CI" ]; then
+  # CircleCI fails, for the Daikon job only, if "-Dorg.gradle.daemon=false" is removed.
+  export GRADLE_OPTS="${GRADLE_OPTS} -Dorg.gradle.daemon=false -Dorg.gradle.console=plain -Xmx4g"
+fi
+
 export SHELLOPTS
 echo "SHELLOPTS=${SHELLOPTS}"
 

checker/bin-devel/is-ci.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Prints "yes" if this process is running under CI.  Prints nothing otherwise.
+
+if [ -n "$CI" ]; then
+  echo "yes"
+elif [ -n "$APPVEYOR" ]; then
+  echo "yes"
+elif [ -n "$AZURE_HTTP_USER_AGENT" ]; then
+  echo "yes"
+elif [ -n "$TF_BUILD" ]; then
+  echo "yes"
+elif [ -n "$CIRCLECI" ]; then
+  echo "yes"
+elif [ -n "$GITHUB_ACTIONS" ]; then
+  echo "yes"
+elif [ -n "$GITLAB_CI" ]; then
+  echo "yes"
+elif [ -n "$TRAVIS" ]; then
+  echo "yes"
+elif [ -n "$JENKINS_URL" ]; then
+  echo "yes"
+elif [ -n "$BUILDKITE" ]; then
+  echo "yes"
+elif [ -n "$TEAMCITY_VERSION" ]; then
+  echo "yes"
+elif [ -n "$DRONE" ]; then
+  echo "yes"
+elif [ -n "$DRONE_BUILD_NUMBER" ]; then
+  echo "yes"
+elif [ -n "$BITBUCKET_BUILD_NUMBER" ]; then
+  echo "yes"
+else
+  true
+fi

checker/bin-devel/wpi-plumelib/test-wpi-plumelib.sh

@@ -89,7 +89,7 @@ test_wpi_plume_lib() {
   if ! cmp --quiet expected.txt actual.txt; then
     echo "Comparing $EXPECTED_FILE $ACTUAL_FILE in $(pwd)"
     diff -u expected.txt actual.txt
-    if [ -n "$AZURE_HTTP_USER_AGENT" ] || [ -n "$CIRCLE_PR_USERNAME" ] || [ -n "$GITHUB_HEAD_REF" ] || [ "$TRAVIS" = "true" ]; then
+    if [ -n "$("$CHECKERFRAMEWORK"/checker/bin-devel/is-ci.sh)" ]; then
       # Running under continuous integration.  Output files that may be useful for debugging.
       echo "TESTDIR = ${TESTDIR}"
       echo "project = ${project}"

dataflow/src/main/java/org/checkerframework/dataflow/expression/ExpressionTreeToJavaExpressionVisitor.java

@@ -978,11 +978,14 @@ public JavaExpression visitBinary(BinaryTree exprTree, Void unused) {
       return types.getArrayType(componentType);
     } else if (typeTree instanceof JCTree.JCAnnotatedType) {
       return convertTreeToTypeMirror(((JCTree.JCAnnotatedType) typeTree).getUnderlyingType());
+    } else if (typeTree instanceof JCTree.JCTypeApply) {
+      return convertTreeToTypeMirror(((JCTree.JCTypeApply) typeTree).getType());
+    } else {
+      System.out.printf(
+          "convertTreeToTypeMirror does not handle %s [%s]%n",
+          typeTree, typeTree.getClass().getSimpleName());
+      return null;
     }
-    System.out.printf(
-        "convertTreeToTypeMirror does not handle %s [%s]%n",
-        typeTree, typeTree.getClass().getSimpleName());
-    return null;
   }
 
   // ///////////////////////////////////////////////////////////////////////////