Skip to content

Make perf testbed OS agnostic #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions testbed/testbed/test_bed.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@
package testbed

import (
"bytes"
"errors"
"log"
"os"
"path"
"path/filepath"
"runtime"
"text/template"

"github.com/spf13/viper"
)
Expand Down Expand Up @@ -64,10 +67,28 @@ func LoadConfig() error {

testBedConfigDir := path.Dir(testBedConfigFile)

// Use templates to expand some selected content on the config file.
cfgTemplate, err := template.ParseFiles(testBedConfigFile)
if err != nil {
log.Fatalf("Template failed to parse config file %q: %s",
testBedConfigFile, err.Error())
}

templateVars := struct {
GOOS string
}{
GOOS: runtime.GOOS,
}
var buf bytes.Buffer
if err := cfgTemplate.Execute(&buf, templateVars); err != nil {
log.Fatalf("Configuration template failed to run on file %q: %s",
testBedConfigFile, err.Error())
}

// Read the config.
v := viper.New()
v.SetConfigFile(testBedConfigFile)
if err = v.ReadInConfig(); err != nil {
v.SetConfigType("yaml")
if err = v.ReadConfig(bytes.NewBuffer(buf.Bytes())); err != nil {
log.Fatalf("Cannot load test bed config from %q: %s",
testBedConfigFile, err.Error())
}
Expand All @@ -78,7 +99,6 @@ func LoadConfig() error {
}

// Convert relative paths to absolute.

testBedConfig.Agent, err = filepath.Abs(path.Join(testBedConfigDir, testBedConfig.Agent))
if err != nil {
log.Fatalf("Cannot resolve file name %q: %s",
Expand Down
2 changes: 0 additions & 2 deletions testbed/tests/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion testbed/tests/local.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
agent: ../../bin/otelsvc_linux
agent: ../../bin/otelsvc_{{.GOOS}}