Skip to content

Commit

Permalink
Moved files out of the scripts folder
Browse files Browse the repository at this point in the history
We now have the `dev-tools` folder, so moved the `aggregate_coverage.py` script
there. The `docker-entrypoint.sh` is moved for now in `libbeat/scripts`.

Also added a README in the `dev-tools` folder and updated the README from the
`libbeat/scripts` folder.
  • Loading branch information
Tudor Golubenco committed Jan 18, 2016
1 parent a33f530 commit f5bd691
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ test_script:

after_test:
- ps: cd $env:GOPATH\src\$env:PROJ
- python ..\scripts\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
- python ..\scripts\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
- python ..\dev-tools\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
- python ..\dev-tools\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
- go tool cover -html=build\coverage\full.cov -o build\coverage\full.html
- ps: Push-AppveyorArtifact build\coverage\full.cov
- ps: Push-AppveyorArtifact build\coverage\full.html
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN set -x \
golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/vet

COPY scripts/docker-entrypoint.sh /entrypoint.sh
COPY libbeat/scripts/docker-entrypoint.sh /entrypoint.sh

ENV GO15VENDOREXPERIMENT=1

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ integration-tests-environment:
.PHONY: system-tests
system-tests: libbeat.test prepare-tests system-tests-setup
. build/system-tests/env/bin/activate; nosetests -w tests/system --process-timeout=$(TIMEOUT) --with-timer
python ${ES_BEATS}/scripts/aggregate_coverage.py -o ${COVERAGE_DIR}/system.cov ./build/system-tests/run
python ${ES_BEATS}/dev-tools/aggregate_coverage.py -o ${COVERAGE_DIR}/system.cov ./build/system-tests/run

# Runs system tests without coverage reports and in parallel
.PHONY: fast-system-tests
Expand Down Expand Up @@ -182,7 +182,7 @@ testsuite:
# Generates a coverage report from the existing coverage files
.PHONY: coverage-report
coverage-report:
python ${ES_BEATS}/scripts/aggregate_coverage.py -o ./${COVERAGE_DIR}/full.cov ./${COVERAGE_DIR}
python ${ES_BEATS}/dev-tools/aggregate_coverage.py -o ./${COVERAGE_DIR}/full.cov ./${COVERAGE_DIR}
go tool cover -html=./${COVERAGE_DIR}/full.cov -o ${COVERAGE_DIR}/full.html
test ! -s ./${COVERAGE_DIR}/unit.cov || go tool cover -html=./${COVERAGE_DIR}/unit.cov -o ${COVERAGE_DIR}/unit.html
test ! -s ./${COVERAGE_DIR}/system.cov || go tool cover -html=./${COVERAGE_DIR}/system.cov -o ${COVERAGE_DIR}/system.html
Expand Down
2 changes: 0 additions & 2 deletions libbeat/scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Below is a brief description of each file / folder.

| File / Folder | Description |
|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|
| docker | Folder for all docker related files which are needed for the test environment |
| crosscompile.bash | Script to crosscompile a beat for all platforms. Use make crosscompile to use this script. |
| docker-entrypoint.sh | Entrypoint file used for the Dockerfile |
| Makefile | General Makefile which is copied over to all beats. This contains the basic methods which are shared across all beat |
| update.sh | This scripts brings a beat up-to-date based on the files in libbeat. This script should only be executed in a beat itself through running make update. |
File renamed without changes.
4 changes: 2 additions & 2 deletions winlogbeat/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ nosetests -v -w tests\system --process-timeout=30
if %errorlevel% neq 0 exit /b %errorlevel%

echo Aggregating Coverage Reports
python ..\scripts\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
python ..\dev-tools\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
if %errorlevel% neq 0 exit /b %errorlevel%
python ..\scripts\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
python ..\dev-tools\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
if %errorlevel% neq 0 exit /b %errorlevel%
go tool cover -html=build\coverage\full.cov -o build\coverage\full.html
if %errorlevel% neq 0 exit /b %errorlevel%
Expand Down

0 comments on commit f5bd691

Please sign in to comment.