Skip to content

Commit

Permalink
Change black_bear to blackbear
Browse files Browse the repository at this point in the history
  • Loading branch information
bwspenc committed Oct 23, 2017
1 parent 2fabeea commit 50cff45
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ include $(MOOSE_DIR)/modules/modules.mk

# dep apps
APPLICATION_DIR := $(CURDIR)
APPLICATION_NAME := black_bear
APPLICATION_NAME := blackbear
BUILD_EXEC := yes
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
include $(FRAMEWORK_DIR)/app.mk
Expand Down
2 changes: 1 addition & 1 deletion run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sys, os
os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))

#### Set the name of the application here and moose directory relative to the application
app_name = 'black_bear'
app_name = 'blackbear'

MOOSE_DIR = os.path.abspath(os.path.join('..', 'moose'))
#### See if a submodule is available
Expand Down
10 changes: 5 additions & 5 deletions unit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ ADDITIONAL_LIBS := $(FRAMEWORK_DIR)/contrib/gtest/libgtest.la
# dep apps
CURRENT_DIR := $(shell pwd)
APPLICATION_DIR := $(CURRENT_DIR)/..
APPLICATION_NAME := black_bear
APPLICATION_NAME := blackbear
include $(FRAMEWORK_DIR)/app.mk

APPLICATION_DIR := $(CURRENT_DIR)
APPLICATION_NAME := black_bear-unit
APPLICATION_NAME := blackbear-unit
BUILD_EXEC := yes

DEP_APPS ?= $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
include $(FRAMEWORK_DIR)/app.mk

# Find all the BlackBear unit test source files and include their dependencies.
black_bear_unit_srcfiles := $(shell find $(CURRENT_DIR)/src -name "*.C")
black_bear_unit_deps := $(patsubst %.C, %.$(obj-suffix).d, $(black_bear_unit_srcfiles))
-include $(black_bear_unit_deps)
blackbear_unit_srcfiles := $(shell find $(CURRENT_DIR)/src -name "*.C")
blackbear_unit_deps := $(patsubst %.C, %.$(obj-suffix).d, $(blackbear_unit_srcfiles))
-include $(blackbear_unit_deps)

###############################################################################
# Additional special case targets should be added here
2 changes: 1 addition & 1 deletion unit/run_tests
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

APPLICATION_NAME=black_bear
APPLICATION_NAME=blackbear
# If $METHOD is not set, use opt
if [ -z $METHOD ]; then
export METHOD=opt
Expand Down

0 comments on commit 50cff45

Please sign in to comment.