Merge pull request #68 from golang-fips/wip/leak

run runtime.GC() a few times before checking for leaks

Author: qmuntal

openssl/openssl_test.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"runtime"
 	"testing"
+	"time"
 
 	"github.com/golang-fips/openssl-fips/openssl"
 )
@@ -42,7 +43,12 @@ func TestMain(m *testing.M) {
 	fmt.Println("OpenSSL version:", openssl.VersionText())
 	fmt.Println("FIPS enabled:", openssl.FIPS())
 	status := m.Run()
-	runtime.GC()
+	for i := 0; i < 5; i++ {
+		// Run GC a few times to avoid false positives in leak detection.
+		runtime.GC()
+		// Sleep a bit to let the finalizers run.
+		time.Sleep(10 * time.Millisecond)
+	}
 	openssl.CheckLeaks()
 	os.Exit(status)
 }

scripts/openssl.sh

@@ -48,7 +48,9 @@ rm -rf "openssl-$version"
 mv "openssl-$tag" "openssl-$version"
 
 cd "openssl-$version"
-./config $config
+# -d makes a debug build which helps with debugging memory issues and
+# other problems. It's not necessary for normal use.
+./config -d $config
 make -j$(nproc) $make
 
 cp -H ./libcrypto.so "/usr/lib/libcrypto.so.${version}"