Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 06:17:17 +08:00
|
|
|
// Copyright 2017 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package logger
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"fmt"
|
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
"os/exec"
|
|
|
|
"path/filepath"
|
|
|
|
"reflect"
|
|
|
|
"sort"
|
|
|
|
"syscall"
|
|
|
|
"testing"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestCreateFileWithRotation(t *testing.T) {
|
|
|
|
dir, err := ioutil.TempDir("", "test-rotation")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to get TempDir: %v", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(dir)
|
|
|
|
|
|
|
|
file := filepath.Join(dir, "build.log")
|
|
|
|
|
|
|
|
writeFile := func(name string, data string) {
|
|
|
|
f, err := CreateFileWithRotation(name, 3)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to create file: %v", err)
|
|
|
|
}
|
|
|
|
if n, err := io.WriteString(f, data); err == nil && n < len(data) {
|
|
|
|
t.Fatalf("Short write")
|
|
|
|
} else if err != nil {
|
|
|
|
t.Fatalf("Failed to write: %v", err)
|
|
|
|
}
|
|
|
|
if err := f.Close(); err != nil {
|
|
|
|
t.Fatalf("Failed to close: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
writeFile(file, "a")
|
|
|
|
writeFile(file, "b")
|
|
|
|
writeFile(file, "c")
|
|
|
|
writeFile(file, "d")
|
|
|
|
writeFile(file, "e")
|
|
|
|
|
|
|
|
d, err := os.Open(dir)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to open dir: %v", err)
|
|
|
|
}
|
|
|
|
names, err := d.Readdirnames(0)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to read dir: %v", err)
|
|
|
|
}
|
|
|
|
sort.Strings(names)
|
2017-10-19 04:18:41 +08:00
|
|
|
expected := []string{".lock_build.log", "build.1.log", "build.2.log", "build.3.log", "build.log"}
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 06:17:17 +08:00
|
|
|
if !reflect.DeepEqual(names, expected) {
|
|
|
|
t.Errorf("File list does not match.")
|
|
|
|
t.Errorf(" got: %v", names)
|
|
|
|
t.Errorf("expected: %v", expected)
|
|
|
|
t.FailNow()
|
|
|
|
}
|
|
|
|
|
|
|
|
expectFileContents := func(name, expected string) {
|
|
|
|
data, err := ioutil.ReadFile(filepath.Join(dir, name))
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Error reading file: %v", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
str := string(data)
|
|
|
|
if str != expected {
|
|
|
|
t.Errorf("Contents of %v does not match.", name)
|
|
|
|
t.Errorf(" got: %v", data)
|
|
|
|
t.Errorf("expected: %v", expected)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
expectFileContents("build.log", "e")
|
|
|
|
expectFileContents("build.1.log", "d")
|
|
|
|
expectFileContents("build.2.log", "c")
|
|
|
|
expectFileContents("build.3.log", "b")
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPanic(t *testing.T) {
|
|
|
|
if os.Getenv("ACTUALLY_PANIC") == "1" {
|
|
|
|
panicValue := "foo"
|
|
|
|
log := New(&bytes.Buffer{})
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
p := recover()
|
|
|
|
|
|
|
|
if p == panicValue {
|
|
|
|
os.Exit(42)
|
|
|
|
} else {
|
2018-03-22 07:25:58 +08:00
|
|
|
fmt.Fprintf(os.Stderr, "Expected %q, got %v\n", panicValue, p)
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 06:17:17 +08:00
|
|
|
os.Exit(3)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
defer log.Cleanup()
|
|
|
|
|
|
|
|
log.Panic(panicValue)
|
|
|
|
os.Exit(2)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run this in an external process so that we don't pollute stderr
|
|
|
|
cmd := exec.Command(os.Args[0], "-test.run=TestPanic")
|
|
|
|
cmd.Env = append(os.Environ(), "ACTUALLY_PANIC=1")
|
|
|
|
err := cmd.Run()
|
|
|
|
if e, ok := err.(*exec.ExitError); ok && e.Sys().(syscall.WaitStatus).ExitStatus() == 42 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
t.Errorf("Expected process to exit with status 42, got %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFatal(t *testing.T) {
|
|
|
|
if os.Getenv("ACTUALLY_FATAL") == "1" {
|
|
|
|
log := New(&bytes.Buffer{})
|
|
|
|
defer func() {
|
|
|
|
// Shouldn't get here
|
|
|
|
os.Exit(3)
|
|
|
|
}()
|
|
|
|
defer log.Cleanup()
|
|
|
|
log.Fatal("Test")
|
|
|
|
os.Exit(0)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd := exec.Command(os.Args[0], "-test.run=TestFatal")
|
|
|
|
cmd.Env = append(os.Environ(), "ACTUALLY_FATAL=1")
|
|
|
|
err := cmd.Run()
|
|
|
|
if e, ok := err.(*exec.ExitError); ok && e.Sys().(syscall.WaitStatus).ExitStatus() == 1 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
t.Errorf("Expected process to exit with status 1, got %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestNonFatal(t *testing.T) {
|
|
|
|
if os.Getenv("ACTUAL_TEST") == "1" {
|
|
|
|
log := New(&bytes.Buffer{})
|
|
|
|
defer log.Cleanup()
|
|
|
|
log.Println("Test")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd := exec.Command(os.Args[0], "-test.run=TestNonFatal")
|
|
|
|
cmd.Env = append(os.Environ(), "ACTUAL_TEST=1")
|
|
|
|
err := cmd.Run()
|
|
|
|
if e, ok := err.(*exec.ExitError); ok || (ok && !e.Success()) {
|
|
|
|
t.Errorf("Expected process to exit cleanly, got %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRecoverFatal(t *testing.T) {
|
|
|
|
log := New(&bytes.Buffer{})
|
|
|
|
defer func() {
|
|
|
|
if p := recover(); p != nil {
|
|
|
|
t.Errorf("Unexpected panic: %#v", p)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
defer Recover(func(err error) {
|
|
|
|
if err.Error() != "Test" {
|
|
|
|
t.Errorf("Expected %q, but got %q", "Test", err.Error())
|
|
|
|
}
|
|
|
|
})
|
|
|
|
log.Fatal("Test")
|
|
|
|
t.Errorf("Should not get here")
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRecoverNonFatal(t *testing.T) {
|
|
|
|
log := New(&bytes.Buffer{})
|
|
|
|
defer func() {
|
|
|
|
if p := recover(); p == nil {
|
|
|
|
t.Errorf("Panic not thrown")
|
|
|
|
} else if p != "Test" {
|
|
|
|
t.Errorf("Expected %q, but got %#v", "Test", p)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
defer Recover(func(err error) {
|
|
|
|
t.Errorf("Recover function should not be called")
|
|
|
|
})
|
|
|
|
log.Panic("Test")
|
|
|
|
t.Errorf("Should not get here")
|
|
|
|
}
|
2019-01-29 12:00:01 +08:00
|
|
|
|
|
|
|
func TestRuntimePanic(t *testing.T) {
|
|
|
|
defer func() {
|
|
|
|
if p := recover(); p == nil {
|
|
|
|
t.Errorf("Panic not thrown")
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
defer Recover(func(err error) {
|
|
|
|
t.Errorf("Recover function should not be called")
|
|
|
|
})
|
|
|
|
var i *int
|
|
|
|
*i = 0
|
|
|
|
t.Errorf("Should not get here")
|
|
|
|
}
|