Skip to content

Commit 0c05177

Browse files
michaelhixsonNateBrady23
authored andcommitted
Revert "Install resin with gcc-6 in separate directory (#3189)" (#3225)
This reverts commit d967f73. This line was breaking the normal resin installation, despite the wishes communicated in the comment: # We need separate folder so not to clash with the normal resin folder mv resin-$RVER resingcc6-$RVER (resin-$RVER is where normal resin was installed, so after this line of code ran, frameworks that depended on normal resin later in the same run would fail.) We could fix that by naming the .tar.gz file in resingcc6.sh to something else, but there are more important issues: 1. The original PR #3189 asked us to test the change and provide sample results. It's not clear they wanted us to merge the change in as is. 2. The way gcc-6 is installed, it's not sandboxed, so actually resin.sh and resingcc6.sh are installing exactly the same build of resin. gcc-6 happens to already be installed from other frameworks and previous runs, so we've already been testing resin with gcc-6 apparently, and this alternative installation is not necessary.
1 parent 0d62fbf commit 0c05177

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

frameworks/Java/servlet/benchmark_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"framework": "servlet",
33
"tests": [{
44
"default": {
5-
"setup_file": "setup-resin-gcc-6",
5+
"setup_file": "setup",
66
"json_url": "/servlet/json",
77
"plaintext_url": "/servlet/plaintext",
88
"port": 8080,

frameworks/Java/servlet/setup-resin-gcc-6.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

toolset/setup/linux/webservers/resin/resingcc6.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)