提交 53d85750 编写于 作者: L luozhewen

9个子系统命令编译适配

Signed-off-by: Nluozhewen <luozhewen@huawei.com>
上级 5f85c77e
文件模式从 100644 更改为 100755
...@@ -10,9 +10,27 @@ ...@@ -10,9 +10,27 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("osaccount_js_test") { ohos_js_hap_suite("osaccount_js_test") {
test_hap_name = "OsAccountJSApiTest" hap_profile = "./src/main/config.json"
hap_source_path = "hap/entry-debug-rich-signed.hap" deps = [
":osaccount_js_assets",
":osaccount_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "OsAccountJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("osaccount_js_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("osaccount_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
文件模式从 100644 更改为 100755
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import file from '@system.file'
import app from '@system.app' import app from '@system.app'
//import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' //import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' import {Core, ExpectExtend} from 'deccjsunit/index'
export default { export default {
data: { data: {
...@@ -28,15 +28,10 @@ export default { ...@@ -28,15 +28,10 @@ export default {
onShow() { onShow() {
console.info('onShow finish') console.info('onShow finish')
const core = Core.getInstance() const core = Core.getInstance()
const expectExtend = new ExpectExtend({
'id': 'extend'
})
const reportExtend = new ReportExtend(file)
// const instrumentLog = new InstrumentLog({ // const instrumentLog = new InstrumentLog({
// 'id': 'report' // 'id': 'report'
// }) // })
core.addService('expect', expectExtend) core.addService('expect', expectExtend)
core.addService('report', reportExtend)
// core.addService('report', instrumentLog) // core.addService('report', instrumentLog)
core.init() core.init()
// core.subscribeEvent('spec', instrumentLog) // core.subscribeEvent('spec', instrumentLog)
...@@ -46,7 +41,7 @@ export default { ...@@ -46,7 +41,7 @@ export default {
const configService = core.getDefaultService('config') const configService = core.getDefaultService('config')
configService.setConfig(this) configService.setConfig(this)
require('../../../test/List.test') require('../../test/List.test')
core.execute() core.execute()
}, },
onReady() { onReady() {
......
...@@ -11,9 +11,27 @@ ...@@ -11,9 +11,27 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ace_standard_test") { ohos_js_hap_suite("ace_standard_test") {
test_hap_name = "ace_standard" hap_profile = "./src/main/config.json"
hap_source_path = "hap/entry-debug-signed.hap" deps = [
":ace_js_assets",
":ace_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ace_standard"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("ace_js_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("ace_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
\ No newline at end of file
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"version": { "version": {
"code": 1000000, "code": 1000000,
"name": "1.0.0" "name": "1.0.0"
},
"apiVersion": {
"compatible": 4,
"target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {},
......
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
}) })
core.addService('expect', expectExtend) core.addService('expect', expectExtend)
core.init() core.init()
require('../../../test/List.test') require('../../test/List.test')
core.execute() core.execute()
}, },
onShow() { onShow() {
......
...@@ -10,9 +10,27 @@ ...@@ -10,9 +10,27 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("appdatamgr_js_test") { ohos_js_hap_suite("appdatamgr_js_test") {
test_hap_name = "AppdatamagrJsTest" hap_profile = "./src/main/config.json"
hap_source_path = "entry-test-signed.hap" deps = [
":appdatamgr_js_assets",
":appdatamgr_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "AppdatamagrJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("appdatamgr_js_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("appdatamgr_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
}, },
"apiVersion": { "apiVersion": {
"compatible": 4, "compatible": 4,
"target": 4 "target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {},
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
import file from '@system.file' import file from '@system.file'
import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' import {Core, ExpectExtend} from 'deccjsunit/index'
export default { export default {
data: { data: {
...@@ -26,18 +26,13 @@ export default { ...@@ -26,18 +26,13 @@ export default {
onShow() { onShow() {
console.info('onShow finish') console.info('onShow finish')
const core = Core.getInstance() const core = Core.getInstance()
const expectExtend = new ExpectExtend({
'id': 'extend'
})
const reportExtend = new ReportExtend(file)
core.addService('expect', expectExtend) core.addService('expect', expectExtend)
core.addService('report', reportExtend)
core.init() core.init()
const configService = core.getDefaultService('config') const configService = core.getDefaultService('config')
configService.setConfig(this) configService.setConfig(this)
require('../../../test/List.test') require('../../test/List.test')
core.execute() core.execute()
}, },
onReady() { onReady() {
......
...@@ -10,9 +10,27 @@ ...@@ -10,9 +10,27 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni")
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("distributeddatamgr_js_test") { ohos_js_hap_suite("distributeddatamgr_js_test") {
test_hap_name = "DistributeddatamgrJsTest" hap_profile = "./src/main/config.json"
hap_source_path = "entry-test-signed.hap" deps = [
":distributeddatamgr_js_assets",
":distributeddatamgr_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "DistributeddatamgrJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("distributeddatamgr_js_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("distributeddatamgr_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
\ No newline at end of file
文件模式从 100644 更改为 100755
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"version": { "version": {
"code": 1000000, "code": 1000000,
"name": "1.0.0" "name": "1.0.0"
},
"apiVersion": {
"compatible": 4,
"target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {},
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
console.info('onShow finish') console.info('onShow finish')
const core = Core.getInstance() const core = Core.getInstance()
core.init() core.init()
require('../../../test/List.test') require('../../test/List.test')
core.execute() core.execute()
}, },
onReady() { onReady() {
......
...@@ -12,8 +12,25 @@ ...@@ -12,8 +12,25 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("intljs_test") { ohos_js_hap_suite("intljs_test") {
test_hap_name = "IntlJsTest" hap_profile = "./src/main/config.json"
hap_source_path = "hap/entry-release-signed.hap" deps = [
":intljs_assets",
":intljs_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "IntlJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("intljs_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("intljs_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
\ No newline at end of file
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
# Project-wide Gradle settings.
# IDE (e.g. DevEco Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# If the Chinese output is garbled, please configure the following parameter.
# org.gradle.jvmargs=-Dfile.encoding=GBK
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
}, },
"apiVersion": { "apiVersion": {
"compatible": 4, "compatible": 4,
"target": 4 "target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {},
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import file from '@system.file'
import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' import {Core, ExpectExtend} from 'deccjsunit/index'
export default { export default {
data: { data: {
...@@ -25,18 +25,14 @@ export default { ...@@ -25,18 +25,14 @@ export default {
onShow() { onShow() {
console.info('onShow finish') console.info('onShow finish')
const core = Core.getInstance() const core = Core.getInstance()
const expectExtend = new ExpectExtend({
'id': 'extend'
})
const reportExtend = new ReportExtend(file)
core.addService('expect', expectExtend) core.addService('expect', expectExtend)
core.addService('report', reportExtend)
core.init() core.init()
const configService = core.getDefaultService('config') const configService = core.getDefaultService('config')
configService.setConfig(this) configService.setConfig(this)
require('../../../test/List.test') require('../../test/List.test')
core.execute() core.execute()
}, },
......
...@@ -12,8 +12,25 @@ ...@@ -12,8 +12,25 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("resmgrjs_test") { ohos_js_hap_suite("resmgrjs_test") {
test_hap_name = "resmgrjs" hap_profile = "./src/main/config.json"
hap_source_path = "hap/entry-debug-rich-signed.hap" deps = [
":resmgrjs_assets",
":resmgrjs_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "resmgrjs"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("resmgrjs_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("resmgrjs_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
} }
\ No newline at end of file
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
# Project-wide Gradle settings.
# IDE (e.g. DevEco Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# If the Chinese output is garbled, please configure the following parameter.
# org.gradle.jvmargs=-Dfile.encoding=GBK
文件模式从 100644 更改为 100755
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
文件模式从 100644 更改为 100755
文件模式从 100644 更改为 100755
文件模式从 100644 更改为 100755
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册